Abstract GoogleURLTracker & google_util Profile dependencies

chrome/browser/google/google_url_tracker.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/google/google_url_tracker.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
@@ skipping 59 matching lines @@
   }
 }
 
 GoogleURLTracker::~GoogleURLTracker() {
   // We should only reach here after any tabs and their infobars have been torn
   // down.
   DCHECK(entry_map_.empty());
 }
 
 // static
-GURL GoogleURLTracker::GoogleURL(Profile* profile) {
-  const GoogleURLTracker* tracker =
-      GoogleURLTrackerFactory::GetForProfile(profile);
-  return tracker ? tracker->google_url_ : GURL(kDefaultGoogleHomepage);
+GURL GoogleURLTracker::DefaultGoogleHomepage() {
+  return GURL(kDefaultGoogleHomepage);
 }
 
-// static
-void GoogleURLTracker::RequestServerCheck(Profile* profile, bool force) {
-  GoogleURLTracker* tracker = GoogleURLTrackerFactory::GetForProfile(profile);
-  // If the tracker already has a fetcher, SetNeedToFetch() is unnecessary, and
-  // changing |already_fetched_| is wrong.
-  if (tracker && !tracker->fetcher_) {
+void GoogleURLTracker::RequestServerCheck(bool force) {
+  // If this instance already has a fetcher, SetNeedToFetch() is unnecessary,
+  // and changing |already_fetched_| is wrong.
+  if (!fetcher_) {
     if (force)
-      tracker->already_fetched_ = false;
-    tracker->SetNeedToFetch();
+      already_fetched_ = false;
+    SetNeedToFetch();
   }
 }
 
-// static
-void GoogleURLTracker::GoogleURLSearchCommitted(Profile* profile) {
-  GoogleURLTracker* tracker = GoogleURLTrackerFactory::GetForProfile(profile);
-  if (tracker)
-    tracker->SearchCommitted();
+void GoogleURLTracker::GoogleURLSearchCommitted() {
+  if (need_to_prompt_) {
+    search_committed_ = true;
+    // These notifications will fire a bit later in the same call chain we're
+    // currently in.
+    if (!client_->IsListeningForNavigationStart())
+      client_->SetListeningForNavigationStart(true);
+  }
 }
 
 void GoogleURLTracker::AcceptGoogleURL(bool redo_searches) {
   GURL old_google_url = google_url_;
   google_url_ = fetched_google_url_;
   PrefService* prefs = profile_->GetPrefs();
   prefs->SetString(prefs::kLastKnownGoogleURL, google_url_.spec());
   prefs->SetString(prefs::kLastPromptedGoogleURL, google_url_.spec());
   NotifyGoogleURLUpdated(old_google_url, google_url_);
 
@@ skipping 145 matching lines @@
                          net::LOAD_DO_NOT_SAVE_COOKIES);
   fetcher_->SetRequestContext(profile_->GetRequestContext());
 
   // Configure to max_retries at most kMaxRetries times for 5xx errors.
   static const int kMaxRetries = 5;
   fetcher_->SetMaxRetriesOn5xx(kMaxRetries);
 
   fetcher_->Start();
 }
 
-void GoogleURLTracker::SearchCommitted() {
-  if (need_to_prompt_) {
-    search_committed_ = true;
-    // These notifications will fire a bit later in the same call chain we're
-    // currently in.
-    if (!client_->IsListeningForNavigationStart())
-      client_->SetListeningForNavigationStart(true);
-  }
-}
-
 void GoogleURLTracker::OnNavigationPending(
     scoped_ptr<GoogleURLTrackerNavigationHelper> nav_helper,
     InfoBarService* infobar_service,
     int pending_id) {
   GoogleURLTrackerMapEntry* map_entry = NULL;
 
   EntryMap::iterator i(entry_map_.find(infobar_service));
   if (i != entry_map_.end())
     map_entry = i->second;
 
@@ skipping 131 matching lines @@
   }
   if (client_->IsListeningForNavigationStart()) {
     DCHECK(!search_committed_);
     client_->SetListeningForNavigationStart(false);
   }
 }
 
 void GoogleURLTracker::NotifyGoogleURLUpdated(GURL old_url, GURL new_url) {
   callback_list_.Notify(old_url, new_url);
 }