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

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/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/platform_util.h"
@@ skipping 29 matching lines @@
 // Adds a transient NavigationEntry to the supplied |contents|'s
 // NavigationController if the page's URL has not already been updated with the
 // supplied |search_terms|. Sets the |search_terms| on the transient entry for
 // search terms extraction to work correctly.
 void EnsureSearchTermsAreSet(content::WebContents* contents,
                              const base::string16& search_terms) {
   content::NavigationController* controller = &contents->GetController();
 
   // If search terms are already correct or there is already a transient entry
   // (there shouldn't be), bail out early.
-  if (chrome::GetSearchTerms(contents) == search_terms ||
+  if (search::GetSearchTerms(contents) == search_terms ||
       controller->GetTransientEntry())
     return;
 
   const content::NavigationEntry* entry = controller->GetLastCommittedEntry();
   scoped_ptr<content::NavigationEntry> transient =
       controller->CreateNavigationEntry(
           entry->GetURL(),
           entry->GetReferrer(),
           entry->GetTransitionType(),
           false,
@@ skipping 40 matching lines @@
 }
 
 void InstantController::ActiveTabChanged() {
   LOG_INSTANT_DEBUG_EVENT(this, "ActiveTabChanged");
   ResetInstantTab();
 }
 
 void InstantController::TabDeactivated(content::WebContents* contents) {
   // If user is deactivating an NTP tab, log the number of mouseovers for this
   // NTP session.
-  if (chrome::IsInstantNTP(contents))
+  if (search::IsInstantNTP(contents))
     InstantTab::EmitNtpStatistics(contents);
 }
 
 void InstantController::LogDebugEvent(const std::string& info) const {
   DVLOG(1) << info;
 
   debug_events_.push_front(std::make_pair(
       base::Time::Now().ToInternalValue(), info));
   static const size_t kMaxDebugEventSize = 2000;
   if (debug_events_.size() > kMaxDebugEventSize)
@@ skipping 67 matching lines @@
     if (instant_service) {
       instant_service->UpdateThemeInfo();
       instant_service->UpdateMostVisitedItemsInfo();
     }
   }
 }
 
 InstantService* InstantController::GetInstantService() const {
   return InstantServiceFactory::GetForProfile(profile());
 }