Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / settings / device_settings_test_helper.cc

diff --git a/src/chrome/browser/chromeos/settings/device_settings_test_helper.cc b/src/chrome/browser/chromeos/settings/device_settings_test_helper.cc
index 8aa4311..e214b43 100644 (file)
--- a/src/chrome/browser/chromeos/settings/device_settings_test_helper.cc
+++ b/src/chrome/browser/chromeos/settings/device_settings_test_helper.cc
@@ -10,12 +10,13 @@
 #include "chrome/browser/chromeos/ownership/owner_settings_service.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/chromeos/settings/mock_owner_key_util.h"
+#include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_dbus_thread_manager.h"
-#include "chromeos/network/network_handler.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
@@ -207,7 +208,6 @@ DeviceSettingsTestBase::DeviceSettingsTestBase()
       user_manager_enabler_(user_manager_),
       owner_key_util_(new MockOwnerKeyUtil()),
       fake_dbus_thread_manager_(new FakeDBusThreadManager()) {
-  fake_dbus_thread_manager_->SetFakeClients();
 }
 
 DeviceSettingsTestBase::~DeviceSettingsTestBase() {
@@ -218,7 +218,6 @@ void DeviceSettingsTestBase::SetUp() {
   // Initialize DBusThreadManager with a stub implementation.
   chromeos::DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager_);
 
-  NetworkHandler::Initialize();
   base::RunLoop().RunUntilIdle();
 
   device_policy_.payload().mutable_metrics_enabled()->set_metrics_enabled(
@@ -239,7 +238,6 @@ void DeviceSettingsTestBase::TearDown() {
   OwnerSettingsService::SetDeviceSettingsServiceForTesting(NULL);
   FlushDeviceSettings();
   device_settings_service_.UnsetSessionManager();
-  NetworkHandler::Shutdown();
   DBusThreadManager::Shutdown();
 }
 
@@ -254,11 +252,13 @@ void DeviceSettingsTestBase::ReloadDeviceSettings() {
 
 void DeviceSettingsTestBase::InitOwner(const std::string& user_id,
                                        bool tpm_is_ready) {
-  const User* user = user_manager_->FindUser(user_id);
+  const user_manager::User* user = user_manager_->FindUser(user_id);
   if (!user) {
     user = user_manager_->AddUser(user_id);
     profile_->set_profile_name(user_id);
-    user_manager_->SetProfileForUser(user, profile_.get());
+
+    ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
+                                                            profile_.get());
   }
   OwnerSettingsService* service =
       OwnerSettingsServiceFactory::GetForProfile(profile_.get());