chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc - Issue 1296663003: Componentize proxy code from chrome/browser/net

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/renderer_context_menu/render_view_context_menu_unittest.cc

Issue 1296663003: Componentize proxy code from chrome/browser/net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 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/net/pref_proxy_config_tracker_impl_unittest.cc ('K') | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | components/proxy_config/pref_proxy_config_tracker_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc

diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc b/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc

index 2f82aa31e49f1893cc405b43f46d62c760064624..41eb04a27b42a25709ab28ed08c393e1aac2cea4 100644

--- a/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc

+++ b/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc

@@ -27,6 +27,7 @@

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

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

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

+#include "components/proxy_config/proxy_prefs.h"

#include "content/public/browser/web_contents.h"

#include "content/public/test/web_contents_tester.h"

@@ -377,11 +378,11 @@ class RenderViewContextMenuPrefsTest : public ChromeRenderViewHostTestHarness {

DataReductionProxyChromeSettingsFactory::GetForBrowserContext(

profile());

- // TODO(bengr): Remove prefs::kProxy registration after M46. See

+ // TODO(bengr): Remove ProxyPrefs::kProxy registration after M46. See

// http://crbug.com/445599.

PrefRegistrySimple* registry =

drp_test_context_->pref_service()->registry();

- registry->RegisterDictionaryPref(prefs::kProxy);

+ registry->RegisterDictionaryPref(ProxyPrefs::kProxy);

drp_test_context_->pref_service()->SetBoolean(

data_reduction_proxy::prefs::kDataReductionProxyEnabled,