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/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 430 matching lines @@
   return url.is_valid() &&
          profile &&
          IsInstantExtendedAPIEnabled() &&
          (url.SchemeIs(chrome::kChromeSearchScheme) ||
           IsInstantURL(url, profile));
 }
 
 bool ShouldUseProcessPerSiteForInstantURL(const GURL& url, Profile* profile) {
   return ShouldAssignURLToInstantRenderer(url, profile) &&
       (url.host() == chrome::kChromeSearchLocalNtpHost ||
-       url.host() == chrome::kChromeSearchOnlineNtpHost);
+       url.host() == chrome::kChromeSearchRemoteNtpHost);
 }
 
 bool IsNTPURL(const GURL& url, Profile* profile) {
   if (!url.is_valid())
     return false;
 
   if (!IsInstantExtendedAPIEnabled())
     return url == GURL(chrome::kChromeUINewTabURL);
 
   const base::string16 search_terms = ExtractSearchTermsFromURL(profile, url);
@@ skipping 210 matching lines @@
     return url;
 
   GURL effective_url(url);
 
   // 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()));
-    }
+  // If this is the URL for a server-provided NTP, replace the host with
+  // "remote-ntp".
+  std::string remote_ntp_host(chrome::kChromeSearchRemoteNtpHost);
+  NewTabURLDetails details = NewTabURLDetails::ForProfile(profile);
+  if (details.state == NEW_TAB_URL_VALID &&
+      search::MatchesOriginAndPath(url, details.url)) {
+    replacements.SetHost(remote_ntp_host.c_str(),
+                         url_parse::Component(0, remote_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 125 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