Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / policy / power_policy_browsertest.cc

diff --git a/src/chrome/browser/chromeos/policy/power_policy_browsertest.cc b/src/chrome/browser/chromeos/policy/power_policy_browsertest.cc
index af8df90..feacbd1 100644 (file)
--- a/src/chrome/browser/chromeos/policy/power_policy_browsertest.cc
+++ b/src/chrome/browser/chromeos/policy/power_policy_browsertest.cc
@@ -10,38 +10,35 @@
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/policy/device_policy_builder.h"
 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/settings/device_settings_service.h"
-#include "chrome/browser/extensions/api/power/power_api_manager.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/common/extensions/api/power.h"
+#include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/cryptohome_client.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "chromeos/dbus/power_manager/policy.pb.h"
 #include "chromeos/dbus/power_policy_controller.h"
+#include "chromeos/login/user_names.h"
 #include "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/policy/core/common/cloud/policy_builder.h"
@@ -52,7 +49,8 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/test/test_utils.h"
-#include "crypto/rsa_private_key.h"
+#include "extensions/browser/api/power/power_api_manager.h"
+#include "extensions/common/api/power.h"
 #include "policy/proto/device_management_backend.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -159,7 +157,7 @@ class PowerPolicyLoginScreenBrowserTest : public PowerPolicyBrowserTestBase {
   // PowerPolicyBrowserTestBase:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
   virtual void SetUpOnMainThread() OVERRIDE;
-  virtual void CleanUpOnMainThread() OVERRIDE;
+  virtual void TearDownOnMainThread() OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(PowerPolicyLoginScreenBrowserTest);
 };
@@ -179,12 +177,11 @@ PowerPolicyBrowserTestBase::PowerPolicyBrowserTestBase()
 }
 
 void PowerPolicyBrowserTestBase::SetUpInProcessBrowserTestFixture() {
+  DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
   power_manager_client_ = new chromeos::FakePowerManagerClient;
-  fake_dbus_thread_manager()->SetPowerManagerClient(
+  dbus_setter()->SetPowerManagerClient(
       scoped_ptr<chromeos::PowerManagerClient>(power_manager_client_));
 
-  DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
-
   // Initialize device policy.
   InstallOwnerKey();
   MarkAsEnterpriseOwned();
@@ -195,7 +192,7 @@ void PowerPolicyBrowserTestBase::SetUpOnMainThread() {
 
   // Initialize user policy.
   InstallUserKey();
-  user_policy_.policy_data().set_username(chromeos::UserManager::kStubUser);
+  user_policy_.policy_data().set_username(chromeos::login::kStubUser);
 }
 
 void PowerPolicyBrowserTestBase::InstallUserKey() {
@@ -203,7 +200,7 @@ void PowerPolicyBrowserTestBase::InstallUserKey() {
   ASSERT_TRUE(PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &user_keys_dir));
   std::string sanitized_username =
       chromeos::CryptohomeClient::GetStubSanitizedUsername(
-          chromeos::UserManager::kStubUser);
+          chromeos::login::kStubUser);
   base::FilePath user_key_file =
       user_keys_dir.AppendASCII(sanitized_username)
                    .AppendASCII("policy.pub");
@@ -218,10 +215,6 @@ void PowerPolicyBrowserTestBase::InstallUserKey() {
 }
 
 void PowerPolicyBrowserTestBase::StoreAndReloadUserPolicy() {
-  ProfileManager* profile_manager = g_browser_process->profile_manager();
-  Profile* profile = profile_manager->GetActiveUserProfile();
-  ASSERT_TRUE(profile);
-
   // Install the new user policy blob in session manager client.
   user_policy_.Build();
   session_manager_client()->set_user_policy(
@@ -231,8 +224,9 @@ void PowerPolicyBrowserTestBase::StoreAndReloadUserPolicy() {
   // Reload user policy from session manager client and wait for the update to
   // take effect.
   RunClosureAndWaitForUserPolicyUpdate(
-      base::Bind(&PowerPolicyBrowserTestBase::ReloadUserPolicy, this, profile),
-      profile);
+      base::Bind(&PowerPolicyBrowserTestBase::ReloadUserPolicy, this,
+                 browser()->profile()),
+      browser()->profile());
 }
 
 void PowerPolicyBrowserTestBase::
@@ -296,11 +290,11 @@ void PowerPolicyLoginScreenBrowserTest::SetUpOnMainThread() {
       content::NotificationService::AllSources()).Wait();
 }
 
-void PowerPolicyLoginScreenBrowserTest::CleanUpOnMainThread() {
+void PowerPolicyLoginScreenBrowserTest::TearDownOnMainThread() {
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::Bind(&chrome::AttemptExit));
   base::RunLoop().RunUntilIdle();
-  PowerPolicyBrowserTestBase::CleanUpOnMainThread();
+  PowerPolicyBrowserTestBase::TearDownOnMainThread();
 }
 
 PowerPolicyInSessionBrowserTest::PowerPolicyInSessionBrowserTest() {
@@ -308,9 +302,6 @@ PowerPolicyInSessionBrowserTest::PowerPolicyInSessionBrowserTest() {
 
 void PowerPolicyInSessionBrowserTest::SetUpOnMainThread() {
   PowerPolicyBrowserTestBase::SetUpOnMainThread();
-
-  // Tell the DeviceSettingsService that there is no local owner.
-  chromeos::DeviceSettingsService::Get()->SetUsername(std::string());
 }
 
 // Verifies that device policy is applied on the login screen.
@@ -488,8 +479,8 @@ IN_PROC_BROWSER_TEST_F(PowerPolicyInSessionBrowserTest, AllowScreenWakeLocks) {
 
   // Pretend an extension grabs a screen wake lock.
   const char kExtensionId[] = "abcdefghijklmnopabcdefghijlkmnop";
-  extensions::PowerApiManager::GetInstance()->AddRequest(
-      kExtensionId, extensions::api::power::LEVEL_DISPLAY);
+  extensions::PowerApiManager::Get(browser()->profile())->AddRequest(
+      kExtensionId, extensions::core_api::power::LEVEL_DISPLAY);
   base::RunLoop().RunUntilIdle();
 
   // Check that the lock is in effect (ignoring ac_idle_action,