| 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_service.h" | 5 #include "chrome/browser/net/pref_proxy_config_service.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
| 9 #include "base/message_loop.h" |
| 9 #include "chrome/browser/net/chrome_url_request_context.h" | 10 #include "chrome/browser/net/chrome_url_request_context.h" |
| 10 #include "chrome/browser/prefs/pref_service_mock_builder.h" | 11 #include "chrome/browser/prefs/pref_service_mock_builder.h" |
| 11 #include "chrome/browser/prefs/proxy_config_dictionary.h" | 12 #include "chrome/browser/prefs/proxy_config_dictionary.h" |
| 12 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
| 13 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
| 14 #include "chrome/test/testing_pref_service.h" | 15 #include "chrome/test/testing_pref_service.h" |
| 16 #include "content/browser/browser_thread.h" |
| 15 #include "net/proxy/proxy_config_service_common_unittest.h" | 17 #include "net/proxy/proxy_config_service_common_unittest.h" |
| 16 #include "testing/gmock/include/gmock/gmock.h" | 18 #include "testing/gmock/include/gmock/gmock.h" |
| 17 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
| 18 | 20 |
| 19 using testing::_; | 21 using testing::_; |
| 20 using testing::Mock; | 22 using testing::Mock; |
| 21 | 23 |
| 22 namespace { | 24 namespace { |
| 23 | 25 |
| 24 const char kFixedPacUrl[] = "http://chromium.org/fixed_pac_url"; | 26 const char kFixedPacUrl[] = "http://chromium.org/fixed_pac_url"; |
| (...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 463 net::ProxyRulesExpectation::Empty(), | 465 net::ProxyRulesExpectation::Empty(), |
| 464 }, | 466 }, |
| 465 }; | 467 }; |
| 466 | 468 |
| 467 INSTANTIATE_TEST_CASE_P( | 469 INSTANTIATE_TEST_CASE_P( |
| 468 PrefProxyConfigServiceCommandLineTestInstance, | 470 PrefProxyConfigServiceCommandLineTestInstance, |
| 469 PrefProxyConfigServiceCommandLineTest, | 471 PrefProxyConfigServiceCommandLineTest, |
| 470 testing::ValuesIn(kCommandLineTestParams)); | 472 testing::ValuesIn(kCommandLineTestParams)); |
| 471 | 473 |
| 472 } // namespace | 474 } // namespace |
| OLD | NEW |