InstantExtended: assign all cacheable NTPs to the same process.

chrome/browser/search/search.cc

 // Copyright 2012 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/search.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 523 matching lines @@
 
   // Replace the scheme with "chrome-search:".
   url_canon::Replacements<char> replacements;
   std::string search_scheme(chrome::kChromeSearchScheme);
   replacements.SetScheme(search_scheme.data(),
                          url_parse::Component(0, search_scheme.length()));
 
   // If the URL corresponds to an online NTP, replace the host with
   // "online-ntp".
   std::string online_ntp_host(chrome::kChromeSearchOnlineNtpHost);
-  TemplateURL* template_url = GetDefaultSearchProviderTemplateURL(profile);
-  if (template_url) {
-    const GURL instant_url = TemplateURLRefToGURL(
-        template_url->instant_url_ref(), kDisableStartMargin, false, false);
-    if (instant_url.is_valid() &&
-        search::MatchesOriginAndPath(url, instant_url)) {
-      replacements.SetHost(online_ntp_host.c_str(),
-                           url_parse::Component(0, online_ntp_host.length()));
-    }
+  const GURL new_tab_url(GetNewTabPageURL(profile));
+  if (new_tab_url.is_valid() &&
+      search::MatchesOriginAndPath(url, new_tab_url)) {
+    replacements.SetHost(online_ntp_host.c_str(),

[kmadhusu, 2014/01/13 17:12:19]

Do we need to change the host to "ntp" or something similar?

[samarth, 2014/02/03 22:47:12]

This will make the host for the cacheable NTP be "online-ntp".  Is that what you
mean?

[kmadhusu, 2014/02/03 22:54:25]

Yes. Do we need to change the host name to "cacheable-ntp"?

[samarth, 2014/02/03 23:32:19]

This name is not persisted anywhere, so it doesn't really matter either way as
long as all NTPs get the same host.  I'm not a huge fan of online-ntp; how about
"remote-ntp".

I also changed the check here to be more precise and only do the rewriting when
the search provider URL was used.

+                         url_parse::Component(0, online_ntp_host.length()));
   }
 
   effective_url = effective_url.ReplaceComponents(replacements);
   return effective_url;
 }
 
 bool HandleNewTabURLRewrite(GURL* url,
                             content::BrowserContext* browser_context) {
   if (!IsInstantExtendedAPIEnabled())
     return false;
@@ skipping 112 matching lines @@
 
 // Given a FieldTrialFlags object, returns the boolean value of the provided
 // flag.
 bool GetBoolValueForFlagWithDefault(const std::string& flag,
                                     bool default_value,
                                     const FieldTrialFlags& flags) {
   return !!GetUInt64ValueForFlagWithDefault(flag, default_value ? 1 : 0, flags);
 }
 
 }  // namespace chrome