OLD | NEW |
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/chromeos/proxy_config_service_impl.h" | 5 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
6 | 6 |
| 7 #include <stddef.h> |
| 8 |
7 #include <vector> | 9 #include <vector> |
8 | 10 |
9 #include "base/format_macros.h" | 11 #include "base/format_macros.h" |
10 #include "base/json/json_writer.h" | 12 #include "base/json/json_writer.h" |
11 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "base/macros.h" |
12 #include "base/message_loop/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
13 #include "base/prefs/testing_pref_service.h" | 16 #include "base/prefs/testing_pref_service.h" |
14 #include "base/strings/stringprintf.h" | 17 #include "base/strings/stringprintf.h" |
15 #include "chrome/browser/chromeos/net/proxy_config_handler.h" | 18 #include "chrome/browser/chromeos/net/proxy_config_handler.h" |
16 #include "chrome/browser/chromeos/settings/cros_settings.h" | 19 #include "chrome/browser/chromeos/settings/cros_settings.h" |
17 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 20 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
18 #include "chrome/browser/chromeos/ui_proxy_config.h" | 21 #include "chrome/browser/chromeos/ui_proxy_config.h" |
19 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.h" |
20 #include "chromeos/dbus/dbus_thread_manager.h" | 23 #include "chromeos/dbus/dbus_thread_manager.h" |
21 #include "chromeos/dbus/shill_profile_client.h" | 24 #include "chromeos/dbus/shill_profile_client.h" |
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
517 network_configs.release()); | 520 network_configs.release()); |
518 | 521 |
519 net::ProxyConfig actual_config; | 522 net::ProxyConfig actual_config; |
520 SyncGetLatestProxyConfig(&actual_config); | 523 SyncGetLatestProxyConfig(&actual_config); |
521 net::ProxyConfig expected_config = | 524 net::ProxyConfig expected_config = |
522 net::ProxyConfig::CreateFromCustomPacURL(GURL("http://domain.com/x")); | 525 net::ProxyConfig::CreateFromCustomPacURL(GURL("http://domain.com/x")); |
523 EXPECT_TRUE(expected_config.Equals(actual_config)); | 526 EXPECT_TRUE(expected_config.Equals(actual_config)); |
524 } | 527 } |
525 | 528 |
526 } // namespace chromeos | 529 } // namespace chromeos |
OLD | NEW |