Partially componentize //chrome/browser/search/search.{h,cc}

chrome/browser/ui/browser_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/browser_instant_controller.h"
 
 #include "base/bind.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
@@ skipping 57 matching lines @@
   if (disposition == NEW_BACKGROUND_TAB || disposition == NEW_WINDOW ||
       disposition == NEW_FOREGROUND_TAB)
     return false;
 
   // The omnibox currently doesn't use other dispositions, so we don't attempt
   // to handle them. If you hit this DCHECK file a bug and I'll (sky) add
   // support for the new disposition.
   DCHECK(disposition == CURRENT_TAB) << disposition;
 
   const base::string16& search_terms =
-      chrome::ExtractSearchTermsFromURL(profile(), url);
+      search::ExtractSearchTermsFromURL(profile(), url);
   EmbeddedSearchRequestParams request_params(url);
   if (search_terms.empty())
     return false;
 
   InstantSearchPrerenderer* prerenderer =
       GetInstantSearchPrerenderer(profile());
   if (prerenderer) {
     if (prerenderer->CanCommitQuery(GetActiveWebContents(), search_terms)) {
       // Submit query to render the prefetched results. Browser will swap the
       // prerendered contents with the active tab contents.
       prerenderer->Commit(search_terms, request_params);
       return false;
     } else {
       prerenderer->Cancel();
     }
   }
 
   // If we will not be replacing search terms from this URL, don't send to
   // InstantController.
-  if (!chrome::IsQueryExtractionAllowedForURL(profile(), url))
+  if (!search::IsQueryExtractionAllowedForURL(profile(), url))
     return false;
   return instant_.SubmitQuery(search_terms, request_params);
 }
 
 Profile* BrowserInstantController::profile() const {
   return browser_->profile();
 }
 
 content::WebContents* BrowserInstantController::GetActiveWebContents() const {
   return browser_->tab_strip_model()->GetActiveWebContents();
@@ skipping 50 matching lines @@
     // Send new search URLs to the renderer.
     content::RenderProcessHost* rph = contents->GetRenderProcessHost();
     instant_service->SendSearchURLsToRenderer(rph);
 
     if (!instant_service->IsInstantProcess(rph->GetID()))
       continue;
 
     if (google_base_url_domain_changed &&
         SearchTabHelper::FromWebContents(contents)->model()->mode().is_ntp()) {
       // Replace the server NTP with the local NTP.
-      content::NavigationController::LoadURLParams
-          params(chrome::GetLocalInstantURL(profile()));
+      content::NavigationController::LoadURLParams params(
+          search::GetLocalInstantURL(profile()));
       params.should_replace_current_entry = true;
       params.referrer = content::Referrer();
       params.transition_type = ui::PAGE_TRANSITION_RELOAD;
       contents->GetController().LoadURLWithParams(params);
     } else {
       // Reload the contents to ensure that it gets assigned to a
       // non-priviledged renderer.
       contents->GetController().Reload(false);
 
       // As the reload was not triggered by the user we don't want to close any
       // infobars. We have to tell the InfoBarService after the reload,
       // otherwise it would ignore this call when
       // WebContentsObserver::DidStartNavigationToPendingEntry is invoked.
       InfoBarService::FromWebContents(contents)->set_ignore_next_reload();
     }
   }
 }