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

chrome/browser/extensions/user_script_master_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/extensions/user_script_master.h"
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/public/browser/notification_registrar.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 static void AddPattern(URLPatternSet* extent, const std::string& pattern) {
   int schemes = URLPattern::SCHEME_ALL;
   extent->AddPattern(URLPattern(schemes, pattern));
 }
 
 }
 
 // Test bringing up a master on a specific directory, putting a script
 // in there, etc.
 
 class UserScriptMasterTest : public testing::Test,
                              public content::NotificationObserver {
  public:
   UserScriptMasterTest()
       : message_loop_(MessageLoop::TYPE_UI),
         shared_memory_(NULL) {
   }
 
   virtual void SetUp() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     // Register for all user script notifications.
     registrar_.Add(this, chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
-                   NotificationService::AllSources());
+                   content::NotificationService::AllSources());
 
     // UserScriptMaster posts tasks to the file thread so make the current
     // thread look like one.
     file_thread_.reset(new BrowserThread(
         BrowserThread::FILE, MessageLoop::current()));
     ui_thread_.reset(new BrowserThread(
         BrowserThread::UI, MessageLoop::current()));
   }
 
   virtual void TearDown() {
@@ skipping 185 matching lines @@
   user_scripts.push_back(user_script);
 
   UserScriptMaster::ScriptReloader* script_reloader =
       new UserScriptMaster::ScriptReloader(NULL);
   script_reloader->AddRef();
   script_reloader->LoadUserScripts(&user_scripts);
   script_reloader->Release();
 
   EXPECT_EQ(content, user_scripts[0].js_scripts()[0].GetContent().as_string());
 }