| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/compiler_specific.h" | 6 #include "base/compiler_specific.h" |
| 7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "chrome/browser/chromeos/login/login_manager_test.h" | 8 #include "chrome/browser/chromeos/login/login_manager_test_helper.h" |
| 9 #include "chrome/browser/chromeos/login/startup_utils.h" | 9 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 10 #include "chrome/browser/chromeos/login/user_adding_screen.h" | 10 #include "chrome/browser/chromeos/login/user_adding_screen.h" |
| 11 #include "chrome/browser/chromeos/login/user_manager.h" | 11 #include "chrome/browser/chromeos/login/user_manager.h" |
| 12 #include "chrome/browser/chromeos/settings/cros_settings.h" | 12 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 13 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" | 13 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" |
| 14 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
| 15 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 15 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 16 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
| 17 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
| 18 #include "chrome/test/base/in_process_browser_test.h" |
| 18 #include "chrome/test/base/ui_test_utils.h" | 19 #include "chrome/test/base/ui_test_utils.h" |
| 19 #include "chromeos/settings/cros_settings_names.h" | 20 #include "chromeos/settings/cros_settings_names.h" |
| 20 #include "content/public/browser/web_contents.h" | 21 #include "content/public/browser/web_contents.h" |
| 21 #include "content/public/test/browser_test_utils.h" | 22 #include "content/public/test/browser_test_utils.h" |
| 22 #include "content/public/test/test_utils.h" | 23 #include "content/public/test/test_utils.h" |
| 23 | 24 |
| 24 namespace chromeos { | 25 namespace chromeos { |
| 25 | 26 |
| 26 namespace { | 27 namespace { |
| 27 | 28 |
| 28 const char* kTestUsers[] = { "test-user1@gmail.com", "test-user2@gmail.com" }; | 29 const char* kTestUsers[] = { "test-user1@gmail.com", "test-user2@gmail.com" }; |
| 29 | 30 |
| 30 } // namespace | 31 } // namespace |
| 31 | 32 |
| 32 class AccountsOptionsTest : public LoginManagerTest { | 33 class AccountsOptionsTest : public InProcessBrowserTest { |
| 33 public: | 34 public: |
| 34 AccountsOptionsTest() | 35 AccountsOptionsTest() |
| 35 : LoginManagerTest(false), | 36 : login_manager_test_helper_(new LoginManagerTestHelper), |
| 36 device_settings_provider_(NULL) { | 37 device_settings_provider_(NULL) { |
| 38 set_exit_when_last_browser_closes(false); |
| 37 stub_settings_provider_.Set(kDeviceOwner, base::StringValue(kTestUsers[0])); | 39 stub_settings_provider_.Set(kDeviceOwner, base::StringValue(kTestUsers[0])); |
| 38 } | 40 } |
| 39 | 41 |
| 40 virtual ~AccountsOptionsTest() { | 42 virtual ~AccountsOptionsTest() { |
| 41 } | 43 } |
| 42 | 44 |
| 43 virtual void SetUpOnMainThread() OVERRIDE { | 45 virtual void SetUpOnMainThread() OVERRIDE { |
| 44 LoginManagerTest::SetUpOnMainThread(); | 46 login_manager_test_helper_->SetUp(); |
| 45 CrosSettings* settings = CrosSettings::Get(); | 47 CrosSettings* settings = CrosSettings::Get(); |
| 46 device_settings_provider_ = settings->GetProvider(kDeviceOwner); | 48 device_settings_provider_ = settings->GetProvider(kDeviceOwner); |
| 47 settings->RemoveSettingsProvider(device_settings_provider_); | 49 settings->RemoveSettingsProvider(device_settings_provider_); |
| 48 settings->AddSettingsProvider(&stub_settings_provider_); | 50 settings->AddSettingsProvider(&stub_settings_provider_); |
| 49 } | 51 } |
| 50 | 52 |
| 51 virtual void CleanUpOnMainThread() OVERRIDE { | 53 virtual void CleanUpOnMainThread() OVERRIDE { |
| 52 CrosSettings* settings = CrosSettings::Get(); | 54 CrosSettings* settings = CrosSettings::Get(); |
| 53 settings->RemoveSettingsProvider(&stub_settings_provider_); | 55 settings->RemoveSettingsProvider(&stub_settings_provider_); |
| 54 settings->AddSettingsProvider(device_settings_provider_); | 56 settings->AddSettingsProvider(device_settings_provider_); |
| 55 LoginManagerTest::CleanUpOnMainThread(); | 57 login_manager_test_helper_->CleanUp(); |
| 56 } | 58 } |
| 57 | 59 |
| 58 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 60 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 59 LoginManagerTest::SetUpCommandLine(command_line); | 61 login_manager_test_helper_->SetUpCommandLine(command_line); |
| 62 } |
| 63 |
| 64 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { |
| 65 login_manager_test_helper_->SetUpLoginUtils(false); |
| 60 } | 66 } |
| 61 | 67 |
| 62 protected: | 68 protected: |
| 63 void CheckAccountsUI(const User* user, bool is_owner) { | 69 void CheckAccountsUI(const User* user, bool is_owner) { |
| 64 Profile* profile = UserManager::Get()->GetProfileByUser(user); | 70 Profile* profile = UserManager::Get()->GetProfileByUser(user); |
| 65 profile->GetPrefs()->SetString(prefs::kGoogleServicesUsername, | 71 profile->GetPrefs()->SetString(prefs::kGoogleServicesUsername, |
| 66 user->email()); | 72 user->email()); |
| 67 | 73 |
| 68 ui_test_utils::BrowserAddedObserver observer; | 74 ui_test_utils::BrowserAddedObserver observer; |
| 69 Browser* browser = CreateBrowser(profile); | 75 Browser* browser = CreateBrowser(profile); |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 | 107 |
| 102 bool whitelist_enabled; | 108 bool whitelist_enabled; |
| 103 ASSERT_TRUE(content::ExecuteScriptAndExtractBool( | 109 ASSERT_TRUE(content::ExecuteScriptAndExtractBool( |
| 104 contents, | 110 contents, |
| 105 "var e = document.getElementById('useWhitelistCheck');" | 111 "var e = document.getElementById('useWhitelistCheck');" |
| 106 "window.domAutomationController.send(!e.disabled);", | 112 "window.domAutomationController.send(!e.disabled);", |
| 107 &whitelist_enabled)); | 113 &whitelist_enabled)); |
| 108 EXPECT_EQ(is_owner, whitelist_enabled); | 114 EXPECT_EQ(is_owner, whitelist_enabled); |
| 109 } | 115 } |
| 110 | 116 |
| 117 scoped_ptr<LoginManagerTestHelper> login_manager_test_helper_; |
| 111 StubCrosSettingsProvider stub_settings_provider_; | 118 StubCrosSettingsProvider stub_settings_provider_; |
| 112 CrosSettingsProvider* device_settings_provider_; | 119 CrosSettingsProvider* device_settings_provider_; |
| 113 | 120 |
| 114 private: | 121 private: |
| 115 DISALLOW_COPY_AND_ASSIGN(AccountsOptionsTest); | 122 DISALLOW_COPY_AND_ASSIGN(AccountsOptionsTest); |
| 116 }; | 123 }; |
| 117 | 124 |
| 118 IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, PRE_MultiProfilesAccountsOptions) { | 125 IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, PRE_MultiProfilesAccountsOptions) { |
| 119 RegisterUser(kTestUsers[0]); | 126 login_manager_test_helper_->RegisterUser(kTestUsers[0]); |
| 120 RegisterUser(kTestUsers[1]); | 127 login_manager_test_helper_->RegisterUser(kTestUsers[1]); |
| 121 StartupUtils::MarkOobeCompleted(); | 128 StartupUtils::MarkOobeCompleted(); |
| 122 } | 129 } |
| 123 | 130 |
| 124 // TODO(pastarmovj): Enable this test once https://crbug.com/362430 is fixed. | 131 // TODO(pastarmovj): Enable this test once https://crbug.com/362430 is fixed. |
| 125 IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, | 132 IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, |
| 126 DISABLED_MultiProfilesAccountsOptions) { | 133 DISABLED_MultiProfilesAccountsOptions) { |
| 127 LoginUser(kTestUsers[0]); | 134 login_manager_test_helper_->LogInUser(kTestUsers[0]); |
| 128 UserAddingScreen::Get()->Start(); | 135 UserAddingScreen::Get()->Start(); |
| 129 content::RunAllPendingInMessageLoop(); | 136 content::RunAllPendingInMessageLoop(); |
| 130 AddUser(kTestUsers[1]); | 137 login_manager_test_helper_->AddUser(kTestUsers[1]); |
| 131 | 138 |
| 132 UserManager* manager = UserManager::Get(); | 139 UserManager* manager = UserManager::Get(); |
| 133 ASSERT_EQ(2u, manager->GetLoggedInUsers().size()); | 140 ASSERT_EQ(2u, manager->GetLoggedInUsers().size()); |
| 134 | 141 |
| 135 CheckAccountsUI(manager->FindUser(kTestUsers[0]), true /* is_owner */); | 142 CheckAccountsUI(manager->FindUser(kTestUsers[0]), true /* is_owner */); |
| 136 CheckAccountsUI(manager->FindUser(kTestUsers[1]), false /* is_owner */); | 143 CheckAccountsUI(manager->FindUser(kTestUsers[1]), false /* is_owner */); |
| 137 } | 144 } |
| 138 | 145 |
| 139 } // namespace chromeos | 146 } // namespace chromeos |
| OLD | NEW |