OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/net/pref_proxy_config_tracker_impl.h" | 5 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
12 #include "base/prefs/pref_registry_simple.h" | 12 #include "base/prefs/pref_registry_simple.h" |
13 #include "base/prefs/testing_pref_service.h" | 13 #include "base/prefs/testing_pref_service.h" |
14 #include "base/test/histogram_tester.h" | 14 #include "base/test/histogram_tester.h" |
15 #include "chrome/browser/prefs/pref_service_mock_factory.h" | 15 #include "chrome/browser/prefs/pref_service_mock_factory.h" |
16 #include "chrome/browser/prefs/proxy_config_dictionary.h" | |
17 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
18 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
| 18 #include "components/proxy_config/proxy_config_dictionary.h" |
19 #include "content/public/test/test_browser_thread.h" | 19 #include "content/public/test/test_browser_thread.h" |
20 #include "net/proxy/proxy_config_service_common_unittest.h" | 20 #include "net/proxy/proxy_config_service_common_unittest.h" |
21 #include "net/proxy/proxy_info.h" | 21 #include "net/proxy/proxy_info.h" |
22 #include "net/proxy/proxy_list.h" | 22 #include "net/proxy/proxy_list.h" |
23 #include "testing/gmock/include/gmock/gmock.h" | 23 #include "testing/gmock/include/gmock/gmock.h" |
24 #include "testing/gtest/include/gtest/gtest.h" | 24 #include "testing/gtest/include/gtest/gtest.h" |
25 | 25 |
26 using content::BrowserThread; | 26 using content::BrowserThread; |
27 using testing::_; | 27 using testing::_; |
28 using testing::Mock; | 28 using testing::Mock; |
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
570 net::ProxyRulesExpectation::Empty(), | 570 net::ProxyRulesExpectation::Empty(), |
571 }, | 571 }, |
572 }; | 572 }; |
573 | 573 |
574 INSTANTIATE_TEST_CASE_P( | 574 INSTANTIATE_TEST_CASE_P( |
575 PrefProxyConfigTrackerImplCommandLineTestInstance, | 575 PrefProxyConfigTrackerImplCommandLineTestInstance, |
576 PrefProxyConfigTrackerImplCommandLineTest, | 576 PrefProxyConfigTrackerImplCommandLineTest, |
577 testing::ValuesIn(kCommandLineTestParams)); | 577 testing::ValuesIn(kCommandLineTestParams)); |
578 | 578 |
579 } // namespace | 579 } // namespace |
OLD | NEW |