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

Side by Side Diff: chrome/browser/net/pref_proxy_config_service_unittest.cc

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 years, 1 month 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 | Annotate | Revision Log
OLDNEW
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 "base/message_loop.h"
10 #include "chrome/browser/net/chrome_url_request_context.h" 10 #include "chrome/browser/net/chrome_url_request_context.h"
11 #include "chrome/browser/prefs/pref_service_mock_builder.h" 11 #include "chrome/browser/prefs/pref_service_mock_builder.h"
12 #include "chrome/browser/prefs/proxy_config_dictionary.h" 12 #include "chrome/browser/prefs/proxy_config_dictionary.h"
13 #include "chrome/common/chrome_switches.h" 13 #include "chrome/common/chrome_switches.h"
14 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
15 #include "chrome/test/base/testing_pref_service.h" 15 #include "chrome/test/base/testing_pref_service.h"
16 #include "content/test/test_browser_thread.h" 16 #include "content/test/test_browser_thread.h"
17 #include "net/proxy/proxy_config_service_common_unittest.h" 17 #include "net/proxy/proxy_config_service_common_unittest.h"
18 #include "testing/gmock/include/gmock/gmock.h" 18 #include "testing/gmock/include/gmock/gmock.h"
19 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
20 20
21 using content::BrowserThread;
21 using testing::_; 22 using testing::_;
22 using testing::Mock; 23 using testing::Mock;
23 24
24 namespace { 25 namespace {
25 26
26 const char kFixedPacUrl[] = "http://chromium.org/fixed_pac_url"; 27 const char kFixedPacUrl[] = "http://chromium.org/fixed_pac_url";
27 28
28 // Testing proxy config service that allows us to fire notifications at will. 29 // Testing proxy config service that allows us to fire notifications at will.
29 class TestProxyConfigService : public net::ProxyConfigService { 30 class TestProxyConfigService : public net::ProxyConfigService {
30 public: 31 public:
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 net::ProxyRulesExpectation::Empty(), 466 net::ProxyRulesExpectation::Empty(),
466 }, 467 },
467 }; 468 };
468 469
469 INSTANTIATE_TEST_CASE_P( 470 INSTANTIATE_TEST_CASE_P(
470 PrefProxyConfigServiceCommandLineTestInstance, 471 PrefProxyConfigServiceCommandLineTestInstance,
471 PrefProxyConfigServiceCommandLineTest, 472 PrefProxyConfigServiceCommandLineTest,
472 testing::ValuesIn(kCommandLineTestParams)); 473 testing::ValuesIn(kCommandLineTestParams));
473 474
474 } // namespace 475 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/net/pref_proxy_config_service.cc ('k') | chrome/browser/net/proxy_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698