chrome/browser/ui/webui/options/preferences_browsertest.cc - Issue 1221033002: Add proxy_config component

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 1221033002: Add proxy_config component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update copyrights Created 5 years, 6 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 b5a89c981aa6b833072e5eb919fe0f70dc587af6..2482e34424c4fef931eb41c0aa2e375756fdd804 100644

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

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

@@ -41,13 +41,13 @@

#include "chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h"

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

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

-#include "chrome/browser/prefs/proxy_config_dictionary.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/shill_profile_client.h"

#include "chromeos/dbus/shill_service_client.h"

#include "chromeos/network/network_state.h"

#include "chromeos/network/network_state_handler.h"

#include "chromeos/settings/cros_settings_names.h"

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

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

#include "third_party/cros_system_api/dbus/service_constants.h"

#endif