Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(121)

Side by Side Diff: chrome/browser/ui/webui/options/preferences_browsertest.cc

Issue 2442313003: Move some proxy config code out of src/chrome (Closed)
Patch Set: Fix DEPS Created 4 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc ('k') | chromeos/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/options/preferences_browsertest.h" 5 #include "chrome/browser/ui/webui/options/preferences_browsertest.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <iostream> 9 #include <iostream>
10 #include <memory> 10 #include <memory>
(...skipping 23 matching lines...) Expand all
34 #include "content/public/browser/notification_source.h" 34 #include "content/public/browser/notification_source.h"
35 #include "content/public/browser/render_view_host.h" 35 #include "content/public/browser/render_view_host.h"
36 #include "content/public/browser/web_contents.h" 36 #include "content/public/browser/web_contents.h"
37 #include "content/public/test/browser_test_utils.h" 37 #include "content/public/test/browser_test_utils.h"
38 #include "testing/gtest/include/gtest/gtest.h" 38 #include "testing/gtest/include/gtest/gtest.h"
39 #include "url/gurl.h" 39 #include "url/gurl.h"
40 40
41 #if defined(OS_CHROMEOS) 41 #if defined(OS_CHROMEOS)
42 #include "base/strings/stringprintf.h" 42 #include "base/strings/stringprintf.h"
43 #include "chrome/browser/browser_process.h" 43 #include "chrome/browser/browser_process.h"
44 #include "chrome/browser/chromeos/net/proxy_config_handler.h"
45 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 44 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
46 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h" 45 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
47 #include "chrome/browser/chromeos/settings/cros_settings.h" 46 #include "chrome/browser/chromeos/settings/cros_settings.h"
48 #include "chrome/browser/chromeos/settings/stub_install_attributes.h" 47 #include "chrome/browser/chromeos/settings/stub_install_attributes.h"
49 #include "chromeos/dbus/dbus_thread_manager.h" 48 #include "chromeos/dbus/dbus_thread_manager.h"
50 #include "chromeos/dbus/shill_profile_client.h" 49 #include "chromeos/dbus/shill_profile_client.h"
51 #include "chromeos/dbus/shill_service_client.h" 50 #include "chromeos/dbus/shill_service_client.h"
52 #include "chromeos/network/network_state.h" 51 #include "chromeos/network/network_state.h"
53 #include "chromeos/network/network_state_handler.h" 52 #include "chromeos/network/network_state_handler.h"
53 #include "chromeos/network/proxy/proxy_config_handler.h"
54 #include "chromeos/settings/cros_settings_names.h" 54 #include "chromeos/settings/cros_settings_names.h"
55 #include "components/onc/onc_pref_names.h" 55 #include "components/onc/onc_pref_names.h"
56 #include "components/proxy_config/proxy_config_dictionary.h" 56 #include "components/proxy_config/proxy_config_dictionary.h"
57 #include "components/proxy_config/proxy_config_pref_names.h" 57 #include "components/proxy_config/proxy_config_pref_names.h"
58 #include "content/public/test/test_utils.h" 58 #include "content/public/test/test_utils.h"
59 #include "third_party/cros_system_api/dbus/service_constants.h" 59 #include "third_party/cros_system_api/dbus/service_constants.h"
60 #endif 60 #endif
61 61
62 using testing::AllOf; 62 using testing::AllOf;
63 using testing::Mock; 63 using testing::Mock;
(...skipping 1030 matching lines...) Expand 10 before | Expand all | Expand 10 after
1094 base::FundamentalValue(3)); 1094 base::FundamentalValue(3));
1095 SetProxyPref(chromeos::proxy_cros_settings_parser::kProxySocksPort, 1095 SetProxyPref(chromeos::proxy_cros_settings_parser::kProxySocksPort,
1096 base::FundamentalValue(4)); 1096 base::FundamentalValue(4));
1097 1097
1098 VerifyCurrentProxyServer( 1098 VerifyCurrentProxyServer(
1099 "http=a.com:1;https=4.3.2.1:2;ftp=c.com:3;socks=socks4://d.com:4", 1099 "http=a.com:1;https=4.3.2.1:2;ftp=c.com:3;socks=socks4://d.com:4",
1100 onc::ONC_SOURCE_NONE); 1100 onc::ONC_SOURCE_NONE);
1101 } 1101 }
1102 1102
1103 #endif 1103 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc ('k') | chromeos/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698