Make NotificationService an interface in the content namespace, and switch callers to use it. Mov...

chrome/browser/google/google_url_tracker_unittest.cc

 // Copyright (c) 2011 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/command_line.h"
 #include "base/message_loop.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/net/url_fetcher.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/test/test_url_fetcher_factory.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // TestNotificationObserver ---------------------------------------------------
 
 namespace {
 
@@ skipping 153 matching lines @@
   fetcher->delegate()->OnURLFetchComplete(fetcher,
       GURL(GoogleURLTracker::kSearchDomainCheckURL), net::URLRequestStatus(),
       200, net::ResponseCookies(), domain);
   // At this point, |fetcher| is deleted.
   MessageLoop::current()->RunAllPending();
 }
 
 void GoogleURLTrackerTest::RequestServerCheck() {
   if (!registrar_.IsRegistered(observer_.get(),
                                chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
-                               NotificationService::AllSources())) {
+                               content::NotificationService::AllSources())) {
     registrar_.Add(observer_.get(), chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
-                   NotificationService::AllSources());
+                   content::NotificationService::AllSources());
   }
   GoogleURLTracker::RequestServerCheck();
   MessageLoop::current()->RunAllPending();
 }
 
 void GoogleURLTrackerTest::FinishSleep() {
   g_browser_process->google_url_tracker()->FinishSleep();
   MessageLoop::current()->RunAllPending();
 }
 
@@ skipping 19 matching lines @@
   return GURL(g_browser_process->local_state()->GetString(
       prefs::kLastPromptedGoogleURL));
 }
 
 void GoogleURLTrackerTest::SearchCommitted(const GURL& search_url) {
   GoogleURLTracker* google_url_tracker =
       g_browser_process->google_url_tracker();
   google_url_tracker->SearchCommitted();
   if (google_url_tracker->registrar_.IsRegistered(google_url_tracker,
       content::NOTIFICATION_NAV_ENTRY_PENDING,
-      NotificationService::AllSources()))
+      content::NotificationService::AllSources()))
     google_url_tracker->search_url_ = search_url;
 }
 
 void GoogleURLTrackerTest::NavEntryCommitted() {
   GoogleURLTracker* google_url_tracker =
       g_browser_process->google_url_tracker();
   google_url_tracker->ShowGoogleURLInfoBarIfNecessary(NULL);
 }
 
 bool GoogleURLTrackerTest::InfoBarIsShown() {
@@ skipping 199 matching lines @@
   NavEntryCommitted();
   EXPECT_TRUE(InfoBarIsShown());
 
   AcceptGoogleURL();
   InfoBarClosed();
   EXPECT_FALSE(InfoBarIsShown());
   EXPECT_EQ(GURL("http://www.google.co.jp/"), GoogleURLTracker::GoogleURL());
   EXPECT_EQ(GURL("http://www.google.co.jp/"), GetLastPromptedGoogleURL());
   EXPECT_TRUE(observer_->notified());
 }