chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc - Issue 1658793002: Update chrome for new prefs location.

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/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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/net/spdyproxy/data_reduction_proxy_settings_android.h ('k') | chrome/browser/notifications/extension_welcome_notification.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc

diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc

index 36f087f115c6ffed3e7784b7c618befdfa7d24e0..8a9d8bcb71206adf1242cf174330682252865a0d 100644

--- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc

+++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc

@@ -12,7 +12,6 @@

#include "base/base64.h"

#include "base/memory/ref_counted.h"

#include "base/memory/scoped_ptr.h"

-#include "base/prefs/pref_service.h"

#include "base/test/test_simple_task_runner.h"

#include "base/time/time.h"

#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"

@@ -24,6 +23,7 @@

#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"

#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h"

#include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h"

+#include "components/prefs/pref_service.h"

#include "components/proxy_config/proxy_prefs.h"

#include "net/proxy/proxy_server.h"

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