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

chrome/browser/ui/bookmarks/bookmark_tab_helper.cc

 // Copyright (c) 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/bookmarks/bookmark_tab_helper.h"
 
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 23 matching lines @@
   return web_ui && NewTabUI::FromWebUIController(web_ui->GetController());
 }
 
 bool IsInstantNTP(content::WebContents* web_contents) {
   // Use the committed entry so the bookmarks bar disappears at the same time
   // the page does.
   const content::NavigationEntry* entry =
       web_contents->GetController().GetLastCommittedEntry();
   if (!entry)
     entry = web_contents->GetController().GetVisibleEntry();
-  return chrome::NavEntryIsInstantNTP(web_contents, entry);
+  return search::NavEntryIsInstantNTP(web_contents, entry);
 }
 
 }  // namespace
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(BookmarkTabHelper);
 
 BookmarkTabHelper::~BookmarkTabHelper() {
   if (bookmark_model_)
     bookmark_model_->RemoveObserver(this);
 }
@@ skipping 84 matching lines @@
     const content::LoadCommittedDetails& /*details*/,
     const content::FrameNavigateParams& /*params*/) {
   UpdateStarredStateForCurrentURL();
 }
 
 void BookmarkTabHelper::DidStartNavigationToPendingEntry(
     const GURL& /*url*/,
     content::NavigationController::ReloadType /*reload_type*/) {
   UpdateStarredStateForCurrentURL();
 }