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

chrome/browser/profiles/profile_manager_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/command_line.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_event_router_forwarder.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "content/browser/browser_thread.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #endif
 
 namespace {
 // This global variable is used to check that value returned to different
 // observers is the same.
@@ skipping 91 matching lines @@
 
   cl->AppendSwitchASCII(switches::kLoginProfile, profile_dir);
   cl->AppendSwitch(switches::kTestType);
 
   FilePath expected_default =
       FilePath().AppendASCII(chrome::kInitialProfile);
   EXPECT_EQ(expected_default.value(),
             profile_manager_->GetInitialProfileDir().value());
 
   profile_manager_->Observe(chrome::NOTIFICATION_LOGIN_USER_CHANGED,
-                           NotificationService::AllSources(),
-                           NotificationService::NoDetails());
+                           content::NotificationService::AllSources(),
+                           content::NotificationService::NoDetails());
   FilePath expected_logged_in(profile_dir);
   EXPECT_EQ(expected_logged_in.value(),
             profile_manager_->GetInitialProfileDir().value());
   VLOG(1) << temp_dir_.path().Append(
       profile_manager_->GetInitialProfileDir()).value();
 }
 
 #endif
 
 TEST_F(ProfileManagerTest, CreateAndUseTwoProfiles) {
@@ skipping 103 matching lines @@
   cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_3"),
                           ASCIIToUTF16("name_3"), string16(), 0);
   cache.SetBackgroundStatusOfProfileAtIndex(0, true);
   cache.SetBackgroundStatusOfProfileAtIndex(2, true);
   EXPECT_EQ(3u, cache.GetNumberOfProfiles());
 
   profile_manager_->AutoloadProfiles();
 
   EXPECT_EQ(2u, profile_manager_->GetLoadedProfiles().size());
 }