chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc - Issue 2907493002: ChromeOS: Per-user time zone: refactor tests first.

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/policy/device_cloud_policy_store_chromeos.cc

Issue 2907493002: ChromeOS: Per-user time zone: refactor tests first. (Closed)

Patch Set: Fix debug build Created 3 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc ('k') | chrome/browser/chromeos/scoped_set_running_on_chromeos_for_testing.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc

diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc

index f069335c56010ed551f99f96963be27c1692e347..5471086376976044fc9b5d4db12cf9e287323644 100644

--- a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc

+++ b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc

@@ -40,7 +40,8 @@ DeviceCloudPolicyStoreChromeOS::DeviceCloudPolicyStoreChromeOS(

}

DeviceCloudPolicyStoreChromeOS::~DeviceCloudPolicyStoreChromeOS() {

- device_settings_service_->RemoveObserver(this);

+ if (device_settings_service_)

+ device_settings_service_->RemoveObserver(this);

}

void DeviceCloudPolicyStoreChromeOS::Store(

@@ -107,6 +108,7 @@ void DeviceCloudPolicyStoreChromeOS::DeviceSettingsUpdated() {

}

void DeviceCloudPolicyStoreChromeOS::OnDeviceSettingsServiceShutdown() {

+ device_settings_service_->RemoveObserver(this);

device_settings_service_ = nullptr;

}