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

chrome/browser/instant/instant_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/command_line.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/instant/instant_controller.h"
@@ skipping 12 matching lines @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.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 "chrome/test/test_navigation_observer.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/browser/notification_service.h"
 
 #define EXPECT_STR_EQ(ascii, utf16) \
   EXPECT_EQ(ASCIIToWide(ascii), UTF16ToWide(utf16))
 
 #if defined(OS_LINUX)
 // These tests are disabled on linux because of http://crbug.com/80118 .
 #define MAYBE_OnChangeEvent DISABLED_OnChangeEvent
 #define MAYBE_SetSuggestionsArrayOfStrings DISABLED_SetSuggestionsArrayOfStrings
 #define MAYBE_SetSuggestionsEmptyArray DISABLED_SetSuggestionsEmptyArray
 #define MAYBE_SetSuggestionsValidJson DISABLED_SetSuggestionsValidJson
@@ skipping 68 matching lines @@
     InstantController::Enable(browser()->profile());
   }
 
   void SetupInstantProvider(const std::string& page) {
     TemplateURLService* model =
         TemplateURLServiceFactory::GetForProfile(browser()->profile());
     ASSERT_TRUE(model);
 
     ui_test_utils::WindowedNotificationObserver service_loaded_observer(
         chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
-        NotificationService::AllSources());
+        content::NotificationService::AllSources());
     if (!model->loaded()) {
       model->Load();
       service_loaded_observer.Wait();
     }
     ASSERT_TRUE(model->loaded());
 
     // TemplateURLService takes ownership of this.
     TemplateURL* template_url = new TemplateURL();
 
     std::string url = StringPrintf(
@@ skipping 52 matching lines @@
     // When the page loads, the initial searchBox values are set and only a
     // resize will have been sent.
     ASSERT_EQ("true 0 0 0 true d false d false 1 1",
               GetSearchStateAsString(preview_, false));
   }
 
   void SetLocationBarText(const std::string& text) {
     ASSERT_NO_FATAL_FAILURE(FindLocationBar());
     ui_test_utils::WindowedNotificationObserver controller_shown_observer(
         chrome::NOTIFICATION_INSTANT_CONTROLLER_SHOWN,
-        NotificationService::AllSources());
+        content::NotificationService::AllSources());
     location_bar_->location_entry()->SetUserText(UTF8ToUTF16(text));
     controller_shown_observer.Wait();
   }
 
   const string16& GetSuggestion() const {
     return browser()->instant()->loader_->complete_suggested_text_;
   }
 
   GURL GetCurrentURL() {
     return browser()->instant()->loader_.get() ?
@@ skipping 406 matching lines @@
 // Makes sure that if the server doesn't support the instant API we don't show
 // anything.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_SearchServerDoesntSupportInstant) {
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("empty.html"));
   ASSERT_NO_FATAL_FAILURE(FindLocationBar());
 
   ui_test_utils::WindowedNotificationObserver tab_closed_observer(
       content::NOTIFICATION_TAB_CLOSED,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
 
   location_bar_->location_entry()->SetUserText(ASCIIToUTF16("d"));
   ASSERT_TRUE(browser()->instant());
   // But because we're waiting to determine if the page really supports instant
   // we shouldn't be showing the preview.
   EXPECT_FALSE(browser()->instant()->is_displayable());
   // But instant should still be active.
   EXPECT_TRUE(HasPreview());
 
   // When the response comes back that the page doesn't support instant the tab
@@ skipping 25 matching lines @@
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("empty.html"));
   GURL url(test_server()->GetURL("files/instant/empty.html"));
   ASSERT_NO_FATAL_FAILURE(FindLocationBar());
   location_bar_->location_entry()->SetUserText(UTF8ToUTF16(url.spec()));
   // The preview should not be showing or active.
   EXPECT_FALSE(browser()->instant()->is_displayable());
   EXPECT_FALSE(HasPreview());
 
   ui_test_utils::WindowedNotificationObserver tab_closed_observer(
       content::NOTIFICATION_TAB_CLOSED,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
 
   // Now type in some search text.
   location_bar_->location_entry()->SetUserText(ASCIIToUTF16("d"));
 
   // Instant should be active.
   ASSERT_TRUE(HasPreview());
   // Instant should not be current (it's still loading).
   EXPECT_FALSE(browser()->instant()->IsCurrent());
 
   // When the response comes back that the page doesn't support instant the tab
@@ skipping 127 matching lines @@
 }
 
 // Make sure the renderer doesn't crash if javascript is blocked.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_DontCrashOnBlockedJS) {
   browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_JAVASCRIPT, CONTENT_SETTING_BLOCK);
   ASSERT_TRUE(test_server()->Start());
 
   ui_test_utils::WindowedNotificationObserver instant_support_observer(
       chrome::NOTIFICATION_INSTANT_SUPPORT_DETERMINED,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
 
   EnableInstant();
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   // Wait for notification that the instant API has been determined.
   instant_support_observer.Wait();
   // As long as we get the notification we're good (the renderer didn't crash).
 }
 
 // Makes sure window.chrome.searchbox doesn't persist when a new page is loaded.
@@ skipping 41 matching lines @@
   EnableInstant();
   SetupInstantProvider("search.html");
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ui_test_utils::ClickOnView(browser(), VIEW_ID_TAB_CONTAINER);
 
   // Verify that there is no previews contents.
   EXPECT_EQ(NULL, browser()->instant()->GetPreviewContents());
 
   ui_test_utils::WindowedNotificationObserver instant_support_observer(
       chrome::NOTIFICATION_INSTANT_SUPPORT_DETERMINED,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
 
   // Focusing the omnibox should cause instant to be preloaded.
   FindLocationBar();
   location_bar_->FocusLocation(false);
   TabContentsWrapper* tab_contents = browser()->instant()->GetPreviewContents();
   EXPECT_TRUE(tab_contents);
 
   instant_support_observer.Wait();
 
   // Instant should have a preview, but not display it.
@@ skipping 55 matching lines @@
 IN_PROC_BROWSER_TEST_F(InstantFieldTrialHiddenTest, MAYBE_ExperimentEnabled) {
   // Check that instant is enabled, despite not setting the preference.
   Profile* profile = browser()->profile();
   EXPECT_FALSE(profile->GetPrefs()->GetBoolean(prefs::kInstantEnabled));
   EXPECT_TRUE(InstantController::IsEnabled(profile));
 
   ASSERT_TRUE(test_server()->Start());
   SetupInstantProvider("search.html");
   ui_test_utils::WindowedNotificationObserver instant_support_observer(
       chrome::NOTIFICATION_INSTANT_SUPPORT_DETERMINED,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
   SetupLocationBar();
   WaitForPreviewToNavigate();
   instant_support_observer.Wait();
 
   // Type into the omnibox, but don't press <Enter> yet.
   location_bar_->location_entry()->SetUserText(UTF8ToUTF16("def"));
 
   // Check that instant is active, but the preview is not showing.
   EXPECT_TRUE(HasPreview());
   EXPECT_FALSE(browser()->instant()->is_displayable());
@@ skipping 11 matching lines @@
   EXPECT_FALSE(browser()->instant()->is_displayable());
   EXPECT_FALSE(browser()->instant()->IsCurrent());
   EXPECT_EQ(tab_contents, browser()->GetSelectedTabContentsWrapper());
 }
 
 // Tests the SearchToNonSearch scenario under the HIDDEN field trial.
 IN_PROC_BROWSER_TEST_F(InstantFieldTrialHiddenTest, MAYBE_SearchToNonSearch) {
   ASSERT_TRUE(test_server()->Start());
   ui_test_utils::WindowedNotificationObserver instant_support_observer(
       chrome::NOTIFICATION_INSTANT_SUPPORT_DETERMINED,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
 
   // Type in some search text.
   SetupInstantProvider("search.html");
   SetupLocationBar();
 
   // Load a non-search URL; don't wait for the preview to navigate.
   GURL url(test_server()->GetURL("files/instant/empty.html"));
   location_bar_->location_entry()->SetUserText(UTF8ToUTF16(url.spec()));
 
   // Wait for the preview to navigate.
   WaitForPreviewToNavigate();
   instant_support_observer.Wait();
 
   // Instant should be active, but not displayable or committable.
   EXPECT_TRUE(HasPreview());
   EXPECT_FALSE(browser()->instant()->is_displayable());
   EXPECT_FALSE(browser()->instant()->PrepareForCommit());
 }