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

Side by Side Diff: chrome/browser/chromeos/proxy_config_service_impl_unittest.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/chromeos/proxy_config_service_impl.h" 5 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/format_macros.h" 11 #include "base/format_macros.h"
12 #include "base/json/json_writer.h" 12 #include "base/json/json_writer.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
16 #include "base/prefs/testing_pref_service.h"
17 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
18 #include "chrome/browser/chromeos/net/proxy_config_handler.h" 17 #include "chrome/browser/chromeos/net/proxy_config_handler.h"
19 #include "chrome/browser/chromeos/settings/cros_settings.h" 18 #include "chrome/browser/chromeos/settings/cros_settings.h"
20 #include "chrome/browser/chromeos/settings/device_settings_service.h" 19 #include "chrome/browser/chromeos/settings/device_settings_service.h"
21 #include "chrome/browser/chromeos/ui_proxy_config.h" 20 #include "chrome/browser/chromeos/ui_proxy_config.h"
22 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
23 #include "chromeos/dbus/dbus_thread_manager.h" 22 #include "chromeos/dbus/dbus_thread_manager.h"
24 #include "chromeos/dbus/shill_profile_client.h" 23 #include "chromeos/dbus/shill_profile_client.h"
25 #include "chromeos/dbus/shill_service_client.h" 24 #include "chromeos/dbus/shill_service_client.h"
26 #include "chromeos/network/network_handler.h" 25 #include "chromeos/network/network_handler.h"
27 #include "chromeos/network/network_profile_handler.h" 26 #include "chromeos/network/network_profile_handler.h"
28 #include "chromeos/network/network_state.h" 27 #include "chromeos/network/network_state.h"
29 #include "chromeos/network/network_state_handler.h" 28 #include "chromeos/network/network_state_handler.h"
30 #include "chromeos/network/onc/onc_utils.h" 29 #include "chromeos/network/onc/onc_utils.h"
31 #include "components/pref_registry/testing_pref_service_syncable.h" 30 #include "components/pref_registry/testing_pref_service_syncable.h"
31 #include "components/prefs/testing_pref_service.h"
32 #include "components/proxy_config/proxy_config_pref_names.h" 32 #include "components/proxy_config/proxy_config_pref_names.h"
33 #include "content/public/test/test_browser_thread.h" 33 #include "content/public/test/test_browser_thread.h"
34 #include "net/proxy/proxy_config.h" 34 #include "net/proxy/proxy_config.h"
35 #include "net/proxy/proxy_config_service_common_unittest.h" 35 #include "net/proxy/proxy_config_service_common_unittest.h"
36 #include "testing/gtest/include/gtest/gtest.h" 36 #include "testing/gtest/include/gtest/gtest.h"
37 #include "third_party/cros_system_api/dbus/service_constants.h" 37 #include "third_party/cros_system_api/dbus/service_constants.h"
38 38
39 using content::BrowserThread; 39 using content::BrowserThread;
40 40
41 namespace chromeos { 41 namespace chromeos {
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 network_configs.release()); 520 network_configs.release());
521 521
522 net::ProxyConfig actual_config; 522 net::ProxyConfig actual_config;
523 SyncGetLatestProxyConfig(&actual_config); 523 SyncGetLatestProxyConfig(&actual_config);
524 net::ProxyConfig expected_config = 524 net::ProxyConfig expected_config =
525 net::ProxyConfig::CreateFromCustomPacURL(GURL("http://domain.com/x")); 525 net::ProxyConfig::CreateFromCustomPacURL(GURL("http://domain.com/x"));
526 EXPECT_TRUE(expected_config.Equals(actual_config)); 526 EXPECT_TRUE(expected_config.Equals(actual_config));
527 } 527 }
528 528
529 } // namespace chromeos 529 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/proxy_config_service_impl.cc ('k') | chrome/browser/chromeos/session_length_limiter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698