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

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

Issue 1118773004: [chrome/browser/chromeos/policy] Replace MessageLoopProxy usage with ThreadTaskRunnerHandle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Review Comments Created 5 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
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/policy/device_local_account_policy_service.h" 5 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "base/files/file_util.h" 13 #include "base/files/file_util.h"
14 #include "base/files/scoped_temp_dir.h" 14 #include "base/files/scoped_temp_dir.h"
15 #include "base/message_loop/message_loop.h"
16 #include "base/message_loop/message_loop_proxy.h"
17 #include "base/path_service.h" 15 #include "base/path_service.h"
18 #include "base/run_loop.h" 16 #include "base/run_loop.h"
19 #include "base/strings/string_number_conversions.h" 17 #include "base/strings/string_number_conversions.h"
20 #include "base/strings/stringprintf.h" 18 #include "base/strings/stringprintf.h"
21 #include "base/test/scoped_path_override.h" 19 #include "base/test/scoped_path_override.h"
22 #include "base/test/test_simple_task_runner.h" 20 #include "base/test/test_simple_task_runner.h"
21 #include "base/thread_task_runner_handle.h"
23 #include "chrome/browser/chromeos/policy/device_local_account.h" 22 #include "chrome/browser/chromeos/policy/device_local_account.h"
24 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h" 23 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h"
25 #include "chrome/browser/chromeos/policy/fake_affiliated_invalidation_service_pr ovider.h" 24 #include "chrome/browser/chromeos/policy/fake_affiliated_invalidation_service_pr ovider.h"
26 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" 25 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
27 #include "chrome/browser/chromeos/settings/cros_settings.h" 26 #include "chrome/browser/chromeos/settings/cros_settings.h"
28 #include "chrome/browser/chromeos/settings/device_settings_service.h" 27 #include "chrome/browser/chromeos/settings/device_settings_service.h"
29 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h" 28 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
30 #include "chrome/common/chrome_paths.h" 29 #include "chrome/common/chrome_paths.h"
31 #include "chromeos/chromeos_paths.h" 30 #include "chromeos/chromeos_paths.h"
32 #include "chromeos/dbus/power_policy_controller.h" 31 #include "chromeos/dbus/power_policy_controller.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 154
156 void DeviceLocalAccountPolicyServiceTestBase::TearDown() { 155 void DeviceLocalAccountPolicyServiceTestBase::TearDown() {
157 service_->Shutdown(); 156 service_->Shutdown();
158 service_.reset(); 157 service_.reset();
159 extension_cache_task_runner_->RunUntilIdle(); 158 extension_cache_task_runner_->RunUntilIdle();
160 chromeos::DeviceSettingsTestBase::TearDown(); 159 chromeos::DeviceSettingsTestBase::TearDown();
161 } 160 }
162 161
163 void DeviceLocalAccountPolicyServiceTestBase::CreatePolicyService() { 162 void DeviceLocalAccountPolicyServiceTestBase::CreatePolicyService() {
164 service_.reset(new DeviceLocalAccountPolicyService( 163 service_.reset(new DeviceLocalAccountPolicyService(
165 &device_settings_test_helper_, 164 &device_settings_test_helper_, &device_settings_service_, &cros_settings_,
166 &device_settings_service_,
167 &cros_settings_,
168 &affiliated_invalidation_service_provider_, 165 &affiliated_invalidation_service_provider_,
169 base::MessageLoopProxy::current(), 166 base::ThreadTaskRunnerHandle::Get(), extension_cache_task_runner_,
170 extension_cache_task_runner_, 167 base::ThreadTaskRunnerHandle::Get(), base::ThreadTaskRunnerHandle::Get(),
171 base::MessageLoopProxy::current(), 168 new net::TestURLRequestContextGetter(
172 base::MessageLoopProxy::current(), 169 base::ThreadTaskRunnerHandle::Get())));
173 new net::TestURLRequestContextGetter(base::MessageLoopProxy::current())));
174 } 170 }
175 171
176 void DeviceLocalAccountPolicyServiceTestBase:: 172 void DeviceLocalAccountPolicyServiceTestBase::
177 InstallDeviceLocalAccountPolicy(const std::string& account_id) { 173 InstallDeviceLocalAccountPolicy(const std::string& account_id) {
178 device_local_account_policy_.policy_data().set_settings_entity_id(account_id); 174 device_local_account_policy_.policy_data().set_settings_entity_id(account_id);
179 device_local_account_policy_.policy_data().set_username(account_id); 175 device_local_account_policy_.policy_data().set_username(account_id);
180 device_local_account_policy_.Build(); 176 device_local_account_policy_.Build();
181 device_settings_test_helper_.set_device_local_account_policy_blob( 177 device_settings_test_helper_.set_device_local_account_policy_blob(
182 account_id, device_local_account_policy_.GetBlob()); 178 account_id, device_local_account_policy_.GetBlob());
183 } 179 }
(...skipping 794 matching lines...) Expand 10 before | Expand all | Expand 10 after
978 em::DeviceManagementResponse response; 974 em::DeviceManagementResponse response;
979 device_local_account_policy_.Build(); 975 device_local_account_policy_.Build();
980 response.mutable_policy_response()->add_response()->CopyFrom( 976 response.mutable_policy_response()->add_response()->CopyFrom(
981 device_local_account_policy_.policy()); 977 device_local_account_policy_.policy());
982 request_job->SendResponse(DM_STATUS_SUCCESS, response); 978 request_job->SendResponse(DM_STATUS_SUCCESS, response);
983 FlushDeviceSettings(); 979 FlushDeviceSettings();
984 Mock::VerifyAndClearExpectations(&provider_observer_); 980 Mock::VerifyAndClearExpectations(&provider_observer_);
985 } 981 }
986 982
987 } // namespace policy 983 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698