InstantExtended: Send search URLs to renderers.

chrome/browser/ui/search/instant_controller.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/ui/search/instant_controller.h"
 
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.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/platform_util.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/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/search/instant_tab.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/search_urls.h"
 #include "chrome/common/url_constants.h"
 #include "components/sessions/serialized_navigation_entry.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "net/base/escape.h"
@@ skipping 112 matching lines @@
   // in by template values).  This check is necessary to make sure we don't
   // inadvertently redirect to the local NTP if someone, say, reloads a SRP
   // while offline, as a committed results page still counts as an instant
   // url.  We also check to make sure there's no forward history, as if
   // someone hits the back button a lot when offline and returns to a NTP
   // we don't want to redirect and nuke their forward history stack.
   const GURL& current_url = contents->GetURL();
   GURL instant_url = chrome::GetInstantURL(profile(),
                                            chrome::kDisableStartMargin);
   if (instant_tab_->IsLocal() ||
-      !chrome::MatchesOriginAndPath(instant_url, current_url) ||
+      !search::MatchesOriginAndPath(instant_url, current_url) ||
       !current_url.ref().empty() ||
       contents->GetController().CanGoForward())
     return;
   LOG_INSTANT_DEBUG_EVENT(this, "InstantPageLoadFailed: instant_tab");
   RedirectToLocalNTP(contents);
 }
 
 bool InstantController::SubmitQuery(const string16& search_terms) {
   if (instant_tab_ && instant_tab_->supports_instant() &&
       search_mode_.is_origin_search()) {
@@ skipping 225 matching lines @@
       content::PAGE_TRANSITION_SERVER_REDIRECT,
       std::string());  // No extra headers.
   // TODO(dcblack): Remove extraneous history entry caused by 404s.
   // Note that the base case of a 204 being returned doesn't push a history
   // entry.
 }
 
 InstantService* InstantController::GetInstantService() const {
   return InstantServiceFactory::GetForProfile(profile());
 }