InstantExtended: Send search URLs to renderers.

chrome/browser/ui/search/instant_ntp_prerenderer.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/ui/search/instant_ntp_prerenderer.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/search/instant_ntp.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/search_urls.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/network_change_notifier.h"
 
 namespace {
 
 void DeleteNTPSoon(scoped_ptr<InstantNTP> ntp) {
   if (!ntp)
     return;
@@ skipping 227 matching lines @@
                                 base::Unretained(this)));
 }
 
 void InstantNTPPrerenderer::ReloadStaleNTP() {
   ResetNTP(GetInstantURL());
 }
 
 bool InstantNTPPrerenderer::PageIsCurrent() const {
   const std::string& instant_url = GetInstantURL();
   if (instant_url.empty() ||
-      !chrome::MatchesOriginAndPath(GURL(ntp()->instant_url()),
+      !search::MatchesOriginAndPath(GURL(ntp()->instant_url()),
                                     GURL(instant_url)))
     return false;
 
   return ntp()->supports_instant();
 }
 
 bool InstantNTPPrerenderer::ShouldSwitchToLocalNTP() const {
   if (!ntp())
     return true;
 
   // Assume users with Javascript disabled do not want the online experience.
   if (!IsJavascriptEnabled())
     return true;
 
   // Already a local page. Not calling IsLocal() because we want to distinguish
   // between the Google-specific and generic local NTP.
   if (ntp()->instant_url() == GetLocalInstantURL())
     return false;
 
   if (PageIsCurrent())
     return false;
 
   // The preloaded NTP does not support instant yet. If we're not in startup,
   // always fall back to the local NTP. If we are in startup, use the local NTP
   // (unless the finch flag to use the remote NTP is set).
   return !(InStartup() && chrome::ShouldPreferRemoteNTPOnStartup());
 }