Misc. small cleanups to minimize TemplateURL refactoring diffs:

chrome/browser/google/google_url_tracker_unittest.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 "base/message_loop.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
@@ skipping 170 matching lines @@
     return;
   fetcher->set_url(GURL(GoogleURLTracker::kSearchDomainCheckURL));
   fetcher->set_response_code(200);
   fetcher->SetResponseString(domain);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
   // At this point, |fetcher| is deleted.
 }
 
 void GoogleURLTrackerTest::RequestServerCheck() {
   if (!registrar_.IsRegistered(observer_.get(),
-                               chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
-                               content::NotificationService::AllSources())) {
+      chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
+      content::NotificationService::AllBrowserContextsAndSources())) {
     registrar_.Add(observer_.get(), chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
-                   content::NotificationService::AllSources());
+        content::NotificationService::AllBrowserContextsAndSources());
   }
   google_url_tracker_->SetNeedToFetch();
 }
 
 void GoogleURLTrackerTest::FinishSleep() {
   google_url_tracker_->FinishSleep();
 }
 
 void GoogleURLTrackerTest::NotifyIPAddressChanged() {
   net::NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
   // For thread safety, the NCN queues tasks to do the actual notifications, so
   // we need to spin the message loop so the tracker will actually be notified.
   MessageLoop::current()->RunAllPending();
 }
 
 void GoogleURLTrackerTest::SetLastPromptedGoogleURL(const GURL& url) {
   g_browser_process->local_state()->SetString(
       prefs::kLastPromptedGoogleURL, url.spec());
 }
 
 GURL GoogleURLTrackerTest::GetLastPromptedGoogleURL() {
   return GURL(g_browser_process->local_state()->GetString(
       prefs::kLastPromptedGoogleURL));
 }
 
 void GoogleURLTrackerTest::SearchCommitted(const GURL& search_url) {
   google_url_tracker_->SearchCommitted();
   if (google_url_tracker_->registrar_.IsRegistered(google_url_tracker_.get(),
       content::NOTIFICATION_NAV_ENTRY_PENDING,
-      content::NotificationService::AllSources()))
+      content::NotificationService::AllBrowserContextsAndSources()))
     google_url_tracker_->search_url_ = search_url;
 }
 
 void GoogleURLTrackerTest::NavEntryCommitted() {
   google_url_tracker_->ShowGoogleURLInfoBarIfNecessary(NULL);
 }
 
 void GoogleURLTrackerTest::AcceptGoogleURL() {
   TestInfoBarDelegate* infobar =
       static_cast<TestInfoBarDelegate*>(google_url_tracker_->infobar_);
@@ skipping 16 matching lines @@
   TestInfoBarDelegate* infobar =
       static_cast<TestInfoBarDelegate*>(google_url_tracker_->infobar_);
   ASSERT_TRUE(infobar);
   ASSERT_TRUE(infobar->google_url_tracker());
   ASSERT_EQ(google_url_tracker_, infobar->google_url_tracker());
   google_url_tracker_->InfoBarClosed();
   delete infobar;
 }
 
 void GoogleURLTrackerTest::ExpectDefaultURLs() {
-  EXPECT_EQ(GURL(GoogleURLTracker::kDefaultGoogleHomepage),
-            google_url_tracker_->google_url_);
+  EXPECT_EQ(GURL(GoogleURLTracker::kDefaultGoogleHomepage), google_url());
   EXPECT_EQ(GURL(), fetched_google_url());
 }
 
 
 // Tests ----------------------------------------------------------------------
 
 TEST_F(GoogleURLTrackerTest, DontFetchWhenNoOneRequestsCheck) {
   ExpectDefaultURLs();
   FinishSleep();
   // No one called RequestServerCheck() so nothing should have happened.
@@ skipping 148 matching lines @@
   NavEntryCommitted();
   EXPECT_TRUE(infobar_showing());
 
   AcceptGoogleURL();
   InfoBarClosed();
   EXPECT_FALSE(infobar_showing());
   EXPECT_EQ(GURL("http://www.google.co.jp/"), google_url());
   EXPECT_EQ(GURL("http://www.google.co.jp/"), GetLastPromptedGoogleURL());
   EXPECT_TRUE(observer_->notified());
 }