chrome/browser/ui/webui/options/preferences_browsertest.cc - Issue 11243002: Move the bits of Prefs where production code has only trivially easy

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/ui/webui/options/preferences_browsertest.cc

Issue 11243002: Move the bits of Prefs where production code has only trivially easy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, fix gypi problem Created 8 years, 2 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/ui/webui/options/preferences_browsertest.cc

diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc

index 5c1f81c89ed6db8aa94e9eb5f84aff9d31fafac5..b8d3bccb3f785eb216452fbc9ddbd9b8753e7dd5 100644

--- a/chrome/browser/ui/webui/options/preferences_browsertest.cc

+++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc

@@ -10,8 +10,8 @@

#include "base/json/json_reader.h"

#include "base/json/json_writer.h"

#include "base/memory/scoped_ptr.h"

+#include "base/prefs/public/pref_service_base.h"

#include "base/values.h"

-#include "chrome/browser/api/prefs/pref_service_base.h"

#include "chrome/browser/policy/browser_policy_connector.h"

#include "chrome/browser/policy/policy_map.h"

#include "chrome/browser/profiles/profile.h"

@@ -31,9 +31,9 @@

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

#if defined(OS_CHROMEOS)

-#include "chrome/browser/chromeos/settings/cros_settings_names.h"

-#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/browser/chromeos/proxy_cros_settings_parser.h"

+#include "chrome/browser/chromeos/settings/cros_settings.h"

+#include "chrome/browser/chromeos/settings/cros_settings_names.h"

#endif

using testing::AllOf;