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

chrome/browser/chromeos/tab_closeable_state_watcher_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 "chrome/browser/chromeos/tab_closeable_state_watcher.h"
 
 #include "base/file_path.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/url_constants.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 "googleurl/src/gurl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 
 class TabCloseableStateWatcherTest : public InProcessBrowserTest {
  public:
   TabCloseableStateWatcherTest() {
     // This test is testing TabCloseStateWatcher, so enable it.
     EnableTabCloseableStateWatcher();
     blank_url_ = GURL(chrome::kAboutBlankURL);
     ntp_url_ = GURL(chrome::kChromeUINewTabURL);
     other_url_ = ui_test_utils::GetTestUrl(
         FilePath(FilePath::kCurrentDirectory),
         FilePath(FILE_PATH_LITERAL("title2.html")));
   }
 
  protected:
   // Wrapper for Browser::AddTabWithURL
   void AddTabWithURL(Browser* browser, const GURL& url) {
     ui_test_utils::WindowedNotificationObserver observer(
-        content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources());
+        content::NOTIFICATION_LOAD_STOP,
+        content::NotificationService::AllSources());
     AddTabAtIndexToBrowser(browser, 0, url, content::PAGE_TRANSITION_TYPED);
     observer.Wait();
   }
 
   // Wrapper for TabCloseableStateWatcher::CanCloseTab
   bool CanCloseTab(const Browser* browser) {
     return browser->tabstrip_model()->delegate()->CanCloseTab();
   }
 
   // Create popup browser.
@@ skipping 261 matching lines @@
   AppModalDialog* confirm = ui_test_utils::WaitForAppModalDialog();
   confirm->native_dialog()->AcceptAppModalDialog();
   NewTabObserver new_tab_observer(browser());
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(browser(), *(BrowserList::begin()));
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(ntp_url_, browser()->GetSelectedTabContents()->GetURL());
 }
 
 }  // namespace chromeos