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

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

Issue 7384008: Revert 92668 - Remove more unnecessary ChromeURLRequestContext members. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 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 | Annotate | Revision Log
Property Changes:
Deleted: svn:eol-style
- LF
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"
10 #include "chrome/browser/net/chrome_url_request_context.h" 9 #include "chrome/browser/net/chrome_url_request_context.h"
11 #include "chrome/browser/prefs/pref_service_mock_builder.h" 10 #include "chrome/browser/prefs/pref_service_mock_builder.h"
12 #include "chrome/browser/prefs/proxy_config_dictionary.h" 11 #include "chrome/browser/prefs/proxy_config_dictionary.h"
13 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
14 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
15 #include "chrome/test/testing_pref_service.h" 14 #include "chrome/test/testing_pref_service.h"
16 #include "content/browser/browser_thread.h"
17 #include "net/proxy/proxy_config_service_common_unittest.h" 15 #include "net/proxy/proxy_config_service_common_unittest.h"
18 #include "testing/gmock/include/gmock/gmock.h" 16 #include "testing/gmock/include/gmock/gmock.h"
19 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
20 18
21 using testing::_; 19 using testing::_;
22 using testing::Mock; 20 using testing::Mock;
23 21
24 namespace { 22 namespace {
25 23
26 const char kFixedPacUrl[] = "http://chromium.org/fixed_pac_url"; 24 const char kFixedPacUrl[] = "http://chromium.org/fixed_pac_url";
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 net::ProxyRulesExpectation::Empty(), 463 net::ProxyRulesExpectation::Empty(),
466 }, 464 },
467 }; 465 };
468 466
469 INSTANTIATE_TEST_CASE_P( 467 INSTANTIATE_TEST_CASE_P(
470 PrefProxyConfigServiceCommandLineTestInstance, 468 PrefProxyConfigServiceCommandLineTestInstance,
471 PrefProxyConfigServiceCommandLineTest, 469 PrefProxyConfigServiceCommandLineTest,
472 testing::ValuesIn(kCommandLineTestParams)); 470 testing::ValuesIn(kCommandLineTestParams));
473 471
474 } // namespace 472 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/net/chrome_url_request_context.cc ('k') | chrome/browser/net/view_blob_internals_job_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698