chrome/browser/chromeos/settings/device_settings_provider_unittest.cc - Issue 12223091: Split testing_pref_service.h/.cc into two parts, generic vs. Chrome-specific.

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_unittest.cc

Issue 12223091: Split testing_pref_service.h/.cc into two parts, generic vs. Chrome-specific. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« chrome/browser/chromeos/settings/cros_settings_unittest.cc ('K') | « chrome/browser/chromeos/settings/cros_settings_unittest.cc ('k') | chrome/browser/content_settings/content_settings_policy_provider_unittest.cc » ('j') | chrome/browser/policy/auto_enrollment_client_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f316153cd6111cbb16dd7668334f2e6dbdaba0c5..493ec3063019da39015a1959bfaad574869ce170 100644

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

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

@@ -19,7 +19,7 @@

#include "chrome/browser/policy/proto/device_management_backend.pb.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/test/base/testing_browser_process.h"

-#include "chrome/test/base/testing_pref_service.h"

+#include "chrome/test/base/testing_pref_service_syncable.h"

Mattias Nissler (ping if slow) 2013/02/12 13:53:32 This should remain testing_pref_service.h I guess?

Jói 2013/02/12 14:35:51 This is for ScopedTestingLocalState.

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"