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

chrome/browser/ui/toolbar/toolbar_model_impl.cc

Index: chrome/browser/ui/toolbar/toolbar_model_impl.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
index 6a17942f731ec0e660e37f7aed1fedc33b99d5c1..083b11b0ef5ac7cddc89b1cf3f02e71b2a4396f0 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
@@ -190,7 +190,7 @@ bool ToolbarModelImpl::ShouldDisplayURL() const {
     }
   }
 
-  return !chrome::IsInstantNTP(delegate_->GetActiveWebContents());
+  return !search::IsInstantNTP(delegate_->GetActiveWebContents());
 }
 
 NavigationController* ToolbarModelImpl::GetNavigationController() const {
@@ -213,7 +213,7 @@ base::string16 ToolbarModelImpl::GetSearchTerms(bool ignore_editing) const {
     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();