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

chrome/browser/search_engines/search_provider_install_data_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 <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/search_provider_install_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_test_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Create a TemplateURL. The caller owns the returned TemplateURL*.
 static TemplateURL* CreateTemplateURL(const std::string& url,
                                       const std::string& keyword) {
   TemplateURL* t_url = new TemplateURL();
   t_url->SetURL(url, 0, 0);
   t_url->set_keyword(UTF8ToUTF16(keyword));
   t_url->set_short_name(UTF8ToUTF16(keyword));
@@ skipping 140 matching lines @@
   }
 
   virtual void TearDown() {
     BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)->PostTask(
         FROM_HERE,
         new DeleteTask<SearchProviderInstallData>(install_data_));
     install_data_ = NULL;
 
     // Make sure that the install data class on the UI thread gets cleaned up.
     // It doesn't matter that this happens after install_data_ is deleted.
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
         content::Source<SearchProviderInstallDataTest>(this),
-        NotificationService::NoDetails());
+        content::NotificationService::NoDetails());
 
     util_.TearDown();
     testing::Test::TearDown();
   }
 
   void SimulateDefaultSearchIsManaged(const std::string& url) {
     ASSERT_FALSE(url.empty());
     TestingPrefService* service = util_.profile()->GetTestingPrefService();
     service->SetManagedPref(
         prefs::kDefaultSearchProviderEnabled,
@@ skipping 109 matching lines @@
   // Change the Google base url.
   google_host = "foo.com";
   util_.SetGoogleBaseURL("http://" + google_host + "/");
   // Wait for the I/O thread to process the update notification.
   TemplateURLServiceTestUtil::BlockTillIOThreadProcessesRequests();
 
   // Verify that the change got picked up.
   test_get_install_state->set_search_provider_host(google_host);
   EXPECT_TRUE(test_get_install_state->RunTests());
 }