chrome/browser/policy/browser_policy_connector.cc - Issue 8588006: Eliminate CrosLibrary::EnsureLoaded

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Rebase 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:

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(),