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

chrome/browser/sessions/session_restore_browsertest.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 "base/file_path.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/page_transition_types.h"
 
 namespace {
 
 // BrowserList::Observer implementation that waits for a browser to be
 // removed.
 class BrowserListObserverImpl : public BrowserList::Observer {
  public:
   BrowserListObserverImpl() : did_remove_(false), running_(false) {
@@ skipping 90 matching lines @@
       FilePath(FilePath::kCurrentDirectory),
       FilePath(FILE_PATH_LITERAL("title2.html"))));
   GURL url3(ui_test_utils::GetTestUrl(
       FilePath(FilePath::kCurrentDirectory),
       FilePath(FILE_PATH_LITERAL("title3.html"))));
 
   // Add and navigate three tabs.
   ui_test_utils::NavigateToURL(browser(), url1);
   {
     ui_test_utils::WindowedNotificationObserver observer(
-        content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources());
+        content::NOTIFICATION_LOAD_STOP,
+        content::NotificationService::AllSources());
     browser()->AddSelectedTabWithURL(url2, content::PAGE_TRANSITION_LINK);
     observer.Wait();
   }
   {
     ui_test_utils::WindowedNotificationObserver observer(
-        content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources());
+        content::NOTIFICATION_LOAD_STOP,
+        content::NotificationService::AllSources());
     browser()->AddSelectedTabWithURL(url3, content::PAGE_TRANSITION_LINK);
     observer.Wait();
   }
 
   TabRestoreService* service =
       TabRestoreServiceFactory::GetForProfile(browser()->profile());
   service->ClearEntries();
 
   browser()->window()->Close();
 
@@ skipping 80 matching lines @@
   }
 
   // Create a new window, which should trigger session restore.
   incognito_browser->NewWindow();
 
   // The first tab should have 'url' as its url.
   Browser* new_browser = ui_test_utils::WaitForNewBrowser();
   ASSERT_TRUE(new_browser);
   EXPECT_EQ(url, new_browser->GetTabContentsAt(0)->GetURL());
 }