chrome/browser/chromeos/settings/device_settings_provider.cc - Issue 14200028: Make CrosSettings and DeviceSettingsService non Lazy instances

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/chromeos/settings/device_settings_provider.cc

Issue 14200028: Make CrosSettings and DeviceSettingsService non Lazy instances (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 8 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:

Index: chrome/browser/chromeos/settings/device_settings_provider.cc

diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc

index 3427ee22bf9d30eb150422b37ae58e84b11c9d56..947cf0d8dee849c53fd4d489295832cd54efb17f 100644

--- a/chrome/browser/chromeos/settings/device_settings_provider.cc

+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc

@@ -683,6 +683,8 @@ void DeviceSettingsProvider::ApplyMetricsSetting(bool use_file,

}

void DeviceSettingsProvider::ApplyRoamingSetting(bool new_value) {

+ if (!CrosLibrary::Get())

+ return; // May not be initialized in tests.

NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();

const NetworkDevice* cellular = cros->FindCellularDevice();

if (cellular) {