Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(432)

Side by Side Diff: chrome/browser/chromeos/login/login_utils_browsertest.cc

Issue 14967003: Drop more dependencies of ProfileKeyedService infrastructure on chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: trybots Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/chromeos/login/login_utils.h" 5 #include "chrome/browser/chromeos/login/login_utils.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 17 matching lines...) Expand all
28 #include "chrome/browser/chromeos/settings/cros_settings.h" 28 #include "chrome/browser/chromeos/settings/cros_settings.h"
29 #include "chrome/browser/chromeos/settings/device_settings_service.h" 29 #include "chrome/browser/chromeos/settings/device_settings_service.h"
30 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h" 30 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
31 #include "chrome/browser/chromeos/settings/mock_owner_key_util.h" 31 #include "chrome/browser/chromeos/settings/mock_owner_key_util.h"
32 #include "chrome/browser/io_thread.h" 32 #include "chrome/browser/io_thread.h"
33 #include "chrome/browser/net/predictor.h" 33 #include "chrome/browser/net/predictor.h"
34 #include "chrome/browser/policy/browser_policy_connector.h" 34 #include "chrome/browser/policy/browser_policy_connector.h"
35 #include "chrome/browser/policy/cloud/device_management_service.h" 35 #include "chrome/browser/policy/cloud/device_management_service.h"
36 #include "chrome/browser/policy/policy_service.h" 36 #include "chrome/browser/policy/policy_service.h"
37 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h" 37 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
38 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
38 #include "chrome/browser/profiles/profile_manager.h" 39 #include "chrome/browser/profiles/profile_manager.h"
39 #include "chrome/browser/rlz/rlz.h" 40 #include "chrome/browser/rlz/rlz.h"
40 #include "chrome/common/chrome_notification_types.h" 41 #include "chrome/common/chrome_notification_types.h"
41 #include "chrome/common/chrome_paths.h" 42 #include "chrome/common/chrome_paths.h"
42 #include "chrome/common/chrome_switches.h" 43 #include "chrome/common/chrome_switches.h"
43 #include "chrome/common/pref_names.h" 44 #include "chrome/common/pref_names.h"
44 #include "chrome/test/base/scoped_testing_local_state.h" 45 #include "chrome/test/base/scoped_testing_local_state.h"
45 #include "chrome/test/base/testing_browser_process.h" 46 #include "chrome/test/base/testing_browser_process.h"
46 #include "chromeos/chromeos_switches.h" 47 #include "chromeos/chromeos_switches.h"
47 #include "chromeos/cryptohome/mock_async_method_caller.h" 48 #include "chromeos/cryptohome/mock_async_method_caller.h"
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 policy::EnterpriseInstallAttributes::LockResult result; 428 policy::EnterpriseInstallAttributes::LockResult result;
428 connector_->GetInstallAttributes()->LockDevice( 429 connector_->GetInstallAttributes()->LockDevice(
429 username, policy::DEVICE_MODE_ENTERPRISE, kDeviceId, 430 username, policy::DEVICE_MODE_ENTERPRISE, kDeviceId,
430 base::Bind(&CopyLockResult, &loop, &result)); 431 base::Bind(&CopyLockResult, &loop, &result));
431 loop.Run(); 432 loop.Run();
432 EXPECT_EQ(policy::EnterpriseInstallAttributes::LOCK_SUCCESS, result); 433 EXPECT_EQ(policy::EnterpriseInstallAttributes::LOCK_SUCCESS, result);
433 RunUntilIdle(); 434 RunUntilIdle();
434 } 435 }
435 436
436 void PrepareProfile(const std::string& username) { 437 void PrepareProfile(const std::string& username) {
438 // Normally this would happen during browser startup, but for tests
439 // we need to trigger creation of Profile-related services.
440 ChromeBrowserMainExtraPartsProfiles::
441 EnsureProfileKeyedServiceFactoriesBuilt();
442
437 DeviceSettingsTestHelper device_settings_test_helper; 443 DeviceSettingsTestHelper device_settings_test_helper;
438 DeviceSettingsService::Get()->SetSessionManager( 444 DeviceSettingsService::Get()->SetSessionManager(
439 &device_settings_test_helper, new MockOwnerKeyUtil()); 445 &device_settings_test_helper, new MockOwnerKeyUtil());
440 446
441 MockSessionManagerClient* session_manager_client = 447 MockSessionManagerClient* session_manager_client =
442 mock_dbus_thread_manager_.mock_session_manager_client(); 448 mock_dbus_thread_manager_.mock_session_manager_client();
443 EXPECT_CALL(*session_manager_client, StartSession(_)); 449 EXPECT_CALL(*session_manager_client, StartSession(_));
444 EXPECT_CALL(*cryptohome_, GetSystemSalt()) 450 EXPECT_CALL(*cryptohome_, GetSystemSalt())
445 .WillRepeatedly(Return(std::string("stub_system_salt"))); 451 .WillRepeatedly(Return(std::string("stub_system_salt")));
446 EXPECT_CALL(*mock_async_method_caller_, AsyncMount(_, _, _, _)) 452 EXPECT_CALL(*mock_async_method_caller_, AsyncMount(_, _, _, _))
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 } 753 }
748 754
749 INSTANTIATE_TEST_CASE_P( 755 INSTANTIATE_TEST_CASE_P(
750 LoginUtilsBlockingLoginTestInstance, 756 LoginUtilsBlockingLoginTestInstance,
751 LoginUtilsBlockingLoginTest, 757 LoginUtilsBlockingLoginTest,
752 testing::Values(0, 1, 2, 3, 4, 5)); 758 testing::Values(0, 1, 2, 3, 4, 5));
753 759
754 } // namespace 760 } // namespace
755 761
756 } 762 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698