chrome/browser/metrics/chromeos_metrics_provider_unittest.cc - Issue 301633006: Move ChromeOS hardware class init out of MetricsService.

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/metrics/chromeos_metrics_provider_unittest.cc

Issue 301633006: Move ChromeOS hardware class init out of MetricsService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 6 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

Index: chrome/browser/metrics/chromeos_metrics_provider_unittest.cc

diff --git a/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc b/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc

index c6a7a8dfa41086e94c7e0f646f04daab216ef220..1e32848b1729fa1983266738a1902d647f2cf705 100644

--- a/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc

+++ b/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc

@@ -77,7 +77,8 @@ class ChromeOSMetricsProviderTest : public testing::Test {

DBusThreadManager::Get()->GetBluetoothDeviceClient());

// Initialize the login state trackers.

- chromeos::LoginState::Initialize();

+ if (!chromeos::LoginState::IsInitialized())

+ chromeos::LoginState::Initialize();

}

virtual void TearDown() OVERRIDE { DBusThreadManager::Shutdown(); }

« no previous file with comments | « chrome/browser/metrics/chromeos_metrics_provider.cc ('k') | chrome/browser/metrics/metrics_log.cc » ('j') | no next file with comments »