Enabling included files when reloading local NTP with --local-ntp-reload.

chrome/browser/search/local_ntp_source.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/search/local_ntp_source.h"
 
 #include "base/command_line.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/search/instant_io_context.h"
 #include "chrome/browser/search/local_files_ntp_source.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/search_engines/template_url_service.h"
 #include "grit/browser_resources.h"
 #include "grit/theme_resources.h"
 #include "net/url_request/url_request.h"
+#include "third_party/re2/re2/re2.h"
+#include "third_party/re2/re2/stringpiece.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/webui/jstemplate_builder.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "url/gurl.h"
 
 namespace {
 
 // Signifies a locally constructed resource, i.e. not from grit/.
 const int kLocalResource = -1;
 
 const char kConfigDataFilename[] = "config.js";
 
+// Matches lines of form '<include src="foo">' and captures 'foo'.
+const std::string kInlineResouceRegex = "<include.*?src\\=[\"'](.+?)[\"'].*?>";
+
 const struct Resource{
   const char* filename;
   int identifier;
   const char* mime_type;
 } kResources[] = {
   { "local-ntp.html", IDR_LOCAL_NTP_HTML, "text/html" },
   { "local-ntp.js", IDR_LOCAL_NTP_JS, "application/javascript" },
   { kConfigDataFilename, kLocalResource, "application/javascript" },
   { "local-ntp.css", IDR_LOCAL_NTP_CSS, "text/css" },
   { "images/close_2.png", IDR_CLOSE_2, "image/png" },
@@ skipping 113 matching lines @@
 LocalNtpSource::LocalNtpSource(Profile* profile) : profile_(profile) {
 }
 
 LocalNtpSource::~LocalNtpSource() {
 }
 
 std::string LocalNtpSource::GetSource() const {
   return chrome::kChromeSearchLocalNtpHost;
 }
 
+// Helper method invoked by both CheckLocalIncludes and FlattenLocalInclude.
+// Checks for any <include> directives; if any are found, loads the associated
+// file and calls FlattenLocalInclude with the result. Otherwise, processing
+// is done, and so the original callback is invoked.
+void LocalNtpSource::CheckLocalIncludesHelper(

[Mathieu, 2015/10/19 19:59:01]

these three functions don't really belong in this file. Please move to
local_files_ntp_source.{cc,h}.

SendLocalFileResource() should take care of all local inlining and call those
functions as needed.

+    const content::URLDataSource::GotDataCallback& callback,
+    std::string resource) {
+  std::string filename;
+  re2::StringPiece resourceWrapper(resource);
+  if (re2::RE2::FindAndConsume(&resourceWrapper, kInlineResouceRegex,
+                               &filename)) {
+    content::URLDataSource::GotDataCallback wrapper =
+        base::Bind(&FlattenLocalInclude, callback, resource);
+    local_ntp::SendLocalFileResource(filename, wrapper);
+  } else {
+    callback.Run(base::RefCountedString::TakeString(&resource));
+  }
+}
+
+// Wrapper around the above helper function for use as a callback. Processes
+// local files to inline any files indicated by an <include> directive.
+void LocalNtpSource::CheckLocalIncludes(
+    const content::URLDataSource::GotDataCallback& callback,
+    base::RefCountedMemory* resource) {
+  std::string resourceAsStr(resource->front_as<char>(), resource->size());
+  CheckLocalIncludesHelper(callback, resourceAsStr);
+}
+
+// Replaces the first <include> directive found with the given file contents.
+// Afterwards, re-invokes CheckLocalIncludesHelper to handle any subsequent
+// <include>s, including those which may have been added by the newly-inlined
+// resource.
+void LocalNtpSource::FlattenLocalInclude(
+    const content::URLDataSource::GotDataCallback& callback,
+    std::string topLevelResource,
+    base::RefCountedMemory* inlineResource) {
+  std::string inlineAsStr(inlineResource->front_as<char>(),
+                          inlineResource->size());
+  re2::RE2::Replace(&topLevelResource, kInlineResouceRegex, inlineAsStr);
+  CheckLocalIncludesHelper(callback, topLevelResource);
+}
+
 void LocalNtpSource::StartDataRequest(
     const std::string& path,
     int render_process_id,
     int render_frame_id,
     const content::URLDataSource::GotDataCallback& callback) {
   std::string stripped_path = StripParameters(path);
   if (stripped_path == kConfigDataFilename) {
     std::string config_data_js = GetConfigData(profile_);
     callback.Run(base::RefCountedString::TakeString(&config_data_js));
     return;
   }
 
 #if !defined(OFFICIAL_BUILD)
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kLocalNtpReload)) {
     if (stripped_path == "local-ntp.html" || stripped_path == "local-ntp.js" ||
         stripped_path == "local-ntp.css") {
       base::ReplaceChars(stripped_path, "-", "_", &stripped_path);
-      local_ntp::SendLocalFileResource(stripped_path, callback);
+      content::URLDataSource::GotDataCallback wrapper =
+          base::Bind(&CheckLocalIncludes, callback);
+      local_ntp::SendLocalFileResource(stripped_path, wrapper);
       return;
     }
   }
 #endif
 
   float scale = 1.0f;
   std::string filename;
   webui::ParsePathAndScale(
       GURL(GetLocalNtpPath() + stripped_path), &filename, &scale);
   ui::ScaleFactor scale_factor = ui::GetSupportedScaleFactor(scale);
@@ skipping 35 matching lines @@
     }
   }
   return false;
 }
 
 std::string LocalNtpSource::GetContentSecurityPolicyFrameSrc() const {
   // Allow embedding of most visited iframes.
   return base::StringPrintf("frame-src %s;",
                             chrome::kChromeSearchMostVisitedUrl);
 }