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

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

Issue 23868021: Prepare ExternalPolicyDataUpdater and ResourceCache for blocking pool (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Re-uploading due to rietveld flake. Created 7 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/policy/cloud/cloud_external_data_manager_base_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/user_cloud_policy_manager_factory_chrom eos.h" 5 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ref_counted.h"
11 #include "base/message_loop/message_loop_proxy.h"
10 #include "base/path_service.h" 12 #include "base/path_service.h"
11 #include "base/time/time.h" 13 #include "base/time/time.h"
12 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/chromeos/login/user.h" 15 #include "chrome/browser/chromeos/login/user.h"
14 #include "chrome/browser/chromeos/login/user_manager.h" 16 #include "chrome/browser/chromeos/login/user_manager.h"
15 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" 17 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
16 #include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h" 18 #include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h"
17 #include "chrome/browser/chromeos/profiles/profile_helper.h" 19 #include "chrome/browser/chromeos/profiles/profile_helper.h"
18 #include "chrome/browser/policy/browser_policy_connector.h" 20 #include "chrome/browser/policy/browser_policy_connector.h"
19 #include "chrome/browser/policy/cloud/device_management_service.h" 21 #include "chrome/browser/policy/cloud/device_management_service.h"
20 #include "chrome/browser/policy/cloud/resource_cache.h" 22 #include "chrome/browser/policy/cloud/resource_cache.h"
21 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
23 #include "chromeos/chromeos_paths.h" 25 #include "chromeos/chromeos_paths.h"
24 #include "chromeos/chromeos_switches.h" 26 #include "chromeos/chromeos_switches.h"
25 #include "chromeos/dbus/dbus_thread_manager.h" 27 #include "chromeos/dbus/dbus_thread_manager.h"
26 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h" 28 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"
29 #include "content/public/browser/browser_thread.h"
27 #include "net/url_request/url_request_context_getter.h" 30 #include "net/url_request/url_request_context_getter.h"
28 31
29 namespace policy { 32 namespace policy {
30 33
31 namespace { 34 namespace {
32 35
33 // Subdirectory in the user's profile for storing legacy user policies. 36 // Subdirectory in the user's profile for storing legacy user policies.
34 const base::FilePath::CharType kDeviceManagementDir[] = 37 const base::FilePath::CharType kDeviceManagementDir[] =
35 FILE_PATH_LITERAL("Device Management"); 38 FILE_PATH_LITERAL("Device Management");
36 // File in the above directory for storing legacy user policy dmtokens. 39 // File in the above directory for storing legacy user policy dmtokens.
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 143
141 scoped_ptr<UserCloudPolicyStoreChromeOS> store( 144 scoped_ptr<UserCloudPolicyStoreChromeOS> store(
142 new UserCloudPolicyStoreChromeOS( 145 new UserCloudPolicyStoreChromeOS(
143 chromeos::DBusThreadManager::Get()->GetCryptohomeClient(), 146 chromeos::DBusThreadManager::Get()->GetCryptohomeClient(),
144 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(), 147 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(),
145 username, policy_key_dir, token_cache_file, policy_cache_file)); 148 username, policy_key_dir, token_cache_file, policy_cache_file));
146 if (force_immediate_load) 149 if (force_immediate_load)
147 store->LoadImmediately(); 150 store->LoadImmediately();
148 151
149 scoped_ptr<ResourceCache> resource_cache; 152 scoped_ptr<ResourceCache> resource_cache;
150 if (command_line->HasSwitch(switches::kEnableComponentCloudPolicy)) 153 if (command_line->HasSwitch(switches::kEnableComponentCloudPolicy)) {
151 resource_cache.reset(new ResourceCache(resource_cache_dir)); 154 resource_cache.reset(new ResourceCache(
155 resource_cache_dir,
156 content::BrowserThread::GetMessageLoopProxyForThread(
157 content::BrowserThread::FILE)));
158 }
152 159
153 scoped_ptr<UserCloudPolicyManagerChromeOS> manager( 160 scoped_ptr<UserCloudPolicyManagerChromeOS> manager(
154 new UserCloudPolicyManagerChromeOS( 161 new UserCloudPolicyManagerChromeOS(
155 store.PassAs<CloudPolicyStore>(), 162 store.PassAs<CloudPolicyStore>(),
156 resource_cache.Pass(), 163 resource_cache.Pass(),
157 wait_for_initial_policy, 164 wait_for_initial_policy,
158 base::TimeDelta::FromSeconds(kInitialPolicyFetchTimeoutSeconds))); 165 base::TimeDelta::FromSeconds(kInitialPolicyFetchTimeoutSeconds)));
159 manager->Init(); 166 manager->Init();
160 manager->Connect(g_browser_process->local_state(), 167 manager->Connect(g_browser_process->local_state(),
161 device_management_service, 168 device_management_service,
(...skipping 22 matching lines...) Expand all
184 BrowserContextKeyedBaseFactory::BrowserContextDestroyed(context); 191 BrowserContextKeyedBaseFactory::BrowserContextDestroyed(context);
185 } 192 }
186 193
187 void UserCloudPolicyManagerFactoryChromeOS::SetEmptyTestingFactory( 194 void UserCloudPolicyManagerFactoryChromeOS::SetEmptyTestingFactory(
188 content::BrowserContext* context) {} 195 content::BrowserContext* context) {}
189 196
190 void UserCloudPolicyManagerFactoryChromeOS::CreateServiceNow( 197 void UserCloudPolicyManagerFactoryChromeOS::CreateServiceNow(
191 content::BrowserContext* context) {} 198 content::BrowserContext* context) {}
192 199
193 } // namespace policy 200 } // namespace policy
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/policy/cloud/cloud_external_data_manager_base_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698