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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/policy/browser_policy_connector.cc

Issue 8588006: Eliminate CrosLibrary::EnsureLoaded (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/extensions/extension_info_private_api_chromeos.cc ('K') | « chrome/browser/geolocation/wifi_data_provider_chromeos.cc ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | chrome/browser/profiles/profile_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/browser_policy_connector.cc
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index 58fb442b246ffa503c09ab5e0accc4414ba074d1..bd27f72590e1658593740bdef04471a07675ff5a 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -412,9 +412,8 @@ void BrowserPolicyConnector::InitializeDevicePolicy() {
CommandLine* command_line = CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kEnableDevicePolicy)) {
device_data_store_.reset(CloudPolicyDataStore::CreateForDevicePolicies());
- chromeos::CryptohomeLibrary* cryptohome = NULL;
- if (chromeos::CrosLibrary::Get()->EnsureLoaded())
- cryptohome = chromeos::CrosLibrary::Get()->GetCryptohomeLibrary();
+ chromeos::CryptohomeLibrary* cryptohome =
+ chromeos::CrosLibrary::Get()->GetCryptohomeLibrary();
install_attributes_.reset(new EnterpriseInstallAttributes(cryptohome));
DevicePolicyCache* device_policy_cache =
new DevicePolicyCache(device_data_store_.get(),
« chrome/browser/extensions/extension_info_private_api_chromeos.cc ('K') | « chrome/browser/geolocation/wifi_data_provider_chromeos.cc ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | chrome/browser/profiles/profile_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698