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

Side by Side 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, 5 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 unified diff | Download patch
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 <iostream> 7 #include <iostream>
8 #include <sstream> 8 #include <sstream>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 23 matching lines...) Expand all
34 #include "url/gurl.h" 34 #include "url/gurl.h"
35 35
36 #if defined(OS_CHROMEOS) 36 #if defined(OS_CHROMEOS)
37 #include "base/strings/stringprintf.h" 37 #include "base/strings/stringprintf.h"
38 #include "chrome/browser/browser_process.h" 38 #include "chrome/browser/browser_process.h"
39 #include "chrome/browser/chromeos/net/proxy_config_handler.h" 39 #include "chrome/browser/chromeos/net/proxy_config_handler.h"
40 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 40 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
41 #include "chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h" 41 #include "chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h"
42 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h" 42 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
43 #include "chrome/browser/chromeos/settings/cros_settings.h" 43 #include "chrome/browser/chromeos/settings/cros_settings.h"
44 #include "chrome/browser/prefs/proxy_config_dictionary.h"
45 #include "chromeos/dbus/dbus_thread_manager.h" 44 #include "chromeos/dbus/dbus_thread_manager.h"
46 #include "chromeos/dbus/shill_profile_client.h" 45 #include "chromeos/dbus/shill_profile_client.h"
47 #include "chromeos/dbus/shill_service_client.h" 46 #include "chromeos/dbus/shill_service_client.h"
48 #include "chromeos/network/network_state.h" 47 #include "chromeos/network/network_state.h"
49 #include "chromeos/network/network_state_handler.h" 48 #include "chromeos/network/network_state_handler.h"
50 #include "chromeos/settings/cros_settings_names.h" 49 #include "chromeos/settings/cros_settings_names.h"
50 #include "components/proxy_config/proxy_config_dictionary.h"
51 #include "content/public/test/test_utils.h" 51 #include "content/public/test/test_utils.h"
52 #include "third_party/cros_system_api/dbus/service_constants.h" 52 #include "third_party/cros_system_api/dbus/service_constants.h"
53 #endif 53 #endif
54 54
55 using testing::AllOf; 55 using testing::AllOf;
56 using testing::Mock; 56 using testing::Mock;
57 using testing::Property; 57 using testing::Property;
58 using testing::Return; 58 using testing::Return;
59 using testing::_; 59 using testing::_;
60 60
(...skipping 1017 matching lines...) Expand 10 before | Expand all | Expand 10 after
1078 SetProxyPref(chromeos::kProxyHttpsPort, base::FundamentalValue(2)); 1078 SetProxyPref(chromeos::kProxyHttpsPort, base::FundamentalValue(2));
1079 SetProxyPref(chromeos::kProxyFtpPort, base::FundamentalValue(3)); 1079 SetProxyPref(chromeos::kProxyFtpPort, base::FundamentalValue(3));
1080 SetProxyPref(chromeos::kProxySocksPort, base::FundamentalValue(4)); 1080 SetProxyPref(chromeos::kProxySocksPort, base::FundamentalValue(4));
1081 1081
1082 VerifyCurrentProxyServer( 1082 VerifyCurrentProxyServer(
1083 "http=a.com:1;https=4.3.2.1:2;ftp=c.com:3;socks=socks4://d.com:4", 1083 "http=a.com:1;https=4.3.2.1:2;ftp=c.com:3;socks=socks4://d.com:4",
1084 onc::ONC_SOURCE_NONE); 1084 onc::ONC_SOURCE_NONE);
1085 } 1085 }
1086 1086
1087 #endif 1087 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/network_state_informer.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698