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

chrome/browser/ui/toolbar/toolbar_model_impl.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/toolbar/toolbar_model_impl.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
@@ skipping 172 matching lines @@
     GURL url = entry->GetURL();
     GURL virtual_url = entry->GetVirtualURL();
     if (url.SchemeIs(content::kChromeUIScheme) ||
         virtual_url.SchemeIs(content::kChromeUIScheme)) {
       if (!url.SchemeIs(content::kChromeUIScheme))
         url = virtual_url;
       return url.host() != chrome::kChromeUINewTabHost;
     }
   }
 
-  return !chrome::IsInstantNTP(delegate_->GetActiveWebContents());
+  return !search::IsInstantNTP(delegate_->GetActiveWebContents());
 }
 
 NavigationController* ToolbarModelImpl::GetNavigationController() const {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   WebContents* current_tab = delegate_->GetActiveWebContents();
   return current_tab ? &current_tab->GetController() : NULL;
 }
 
 Profile* ToolbarModelImpl::GetProfile() const {
   NavigationController* navigation_controller = GetNavigationController();
   return navigation_controller ?
       Profile::FromBrowserContext(navigation_controller->GetBrowserContext()) :
       NULL;
 }
 
 base::string16 ToolbarModelImpl::GetSearchTerms(bool ignore_editing) const {
   if (!url_replacement_enabled() || (input_in_progress() && !ignore_editing))
     return base::string16();
 
   const WebContents* web_contents = delegate_->GetActiveWebContents();
-  base::string16 search_terms(chrome::GetSearchTerms(web_contents));
+  base::string16 search_terms(search::GetSearchTerms(web_contents));
   if (search_terms.empty()) {
     // We mainly do this to enforce the subsequent DCHECK.
     return base::string16();
   }
 
   // If the page is still loading and the security style is unknown, consider
   // the page secure.  Without this, after the user hit enter on some search
   // terms, the omnibox would change to displaying the loading URL before
   // changing back to the search terms once they could be extracted, thus
   // causing annoying flicker.
@@ skipping 12 matching lines @@
 
   // Otherwise, extract search terms for HTTPS pages that do not have a security
   // error.
   connection_security::SecurityLevel security_level =
       GetSecurityLevel(ignore_editing);
   return ((security_level == connection_security::NONE) ||
           (security_level == connection_security::SECURITY_ERROR))
              ? base::string16()
              : search_terms;
 }