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

Side by Side Diff: chrome/browser/chromeos/policy/consumer_enrollment_handler_factory_unittest.cc

Issue 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names
Patch Set: Fix Win GN build. Created 5 years, 1 month 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
OLDNEW
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 "chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.h" 5 #include "chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.h"
6 6
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/browser_process_platform_part.h" 8 #include "chrome/browser/browser_process_platform_part.h"
9 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" 9 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
10 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" 10 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
(...skipping 26 matching lines...) Expand all
37 ConsumerManagementService::STATUS_ENROLLING, 37 ConsumerManagementService::STATUS_ENROLLING,
38 ConsumerManagementStage::EnrollmentOwnerStored()); 38 ConsumerManagementStage::EnrollmentOwnerStored());
39 39
40 // Inject fake objects. 40 // Inject fake objects.
41 BrowserPolicyConnectorChromeOS* connector = 41 BrowserPolicyConnectorChromeOS* connector =
42 g_browser_process->platform_part()->browser_policy_connector_chromeos(); 42 g_browser_process->platform_part()->browser_policy_connector_chromeos();
43 connector->SetConsumerManagementServiceForTesting( 43 connector->SetConsumerManagementServiceForTesting(
44 make_scoped_ptr(fake_service_)); 44 make_scoped_ptr(fake_service_));
45 45
46 // Set up FakeChromeUserManager. 46 // Set up FakeChromeUserManager.
47 fake_user_manager_->AddUser(kTestOwner); 47 fake_user_manager_->AddUser(AccountId::FromUserEmail(kTestOwner));
48 fake_user_manager_->AddUser(kTestUser); 48 fake_user_manager_->AddUser(AccountId::FromUserEmail(kTestUser));
49 fake_user_manager_->set_owner_email(kTestOwner); 49 fake_user_manager_->set_owner_id(AccountId::FromUserEmail(kTestOwner));
50 } 50 }
51 51
52 void SetUp() override { 52 void SetUp() override {
53 ASSERT_TRUE(testing_profile_manager_->SetUp()); 53 ASSERT_TRUE(testing_profile_manager_->SetUp());
54 } 54 }
55 55
56 content::TestBrowserThreadBundle thread_bundle_; 56 content::TestBrowserThreadBundle thread_bundle_;
57 FakeConsumerManagementService* fake_service_; 57 FakeConsumerManagementService* fake_service_;
58 chromeos::FakeChromeUserManager* fake_user_manager_; 58 chromeos::FakeChromeUserManager* fake_user_manager_;
59 chromeos::ScopedUserManagerEnabler scoped_user_manager_enabler_; 59 chromeos::ScopedUserManagerEnabler scoped_user_manager_enabler_;
(...skipping 14 matching lines...) Expand all
74 ServiceIsNotCreatedIfItHasNothingToDo) { 74 ServiceIsNotCreatedIfItHasNothingToDo) {
75 fake_service_->SetStatusAndStage( 75 fake_service_->SetStatusAndStage(
76 ConsumerManagementService::STATUS_UNENROLLED, 76 ConsumerManagementService::STATUS_UNENROLLED,
77 ConsumerManagementStage::None()); 77 ConsumerManagementStage::None());
78 78
79 Profile* profile = testing_profile_manager_->CreateTestingProfile(kTestOwner); 79 Profile* profile = testing_profile_manager_->CreateTestingProfile(kTestOwner);
80 EXPECT_FALSE(ConsumerEnrollmentHandlerFactory::GetForBrowserContext(profile)); 80 EXPECT_FALSE(ConsumerEnrollmentHandlerFactory::GetForBrowserContext(profile));
81 } 81 }
82 82
83 } // namespace policy 83 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698