OLD | NEW |
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 <string> | 5 #include <string> |
6 #include <vector> | 6 #include <vector> |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/memory/scoped_vector.h" | 9 #include "base/memory/scoped_vector.h" |
| 10 #include "base/prefs/testing_pref_service.h" |
10 #include "chrome/browser/chrome_browser_main.h" | 11 #include "chrome/browser/chrome_browser_main.h" |
11 #include "chrome/browser/chrome_content_browser_client.h" | 12 #include "chrome/browser/chrome_content_browser_client.h" |
12 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
13 #include "chrome/test/base/testing_pref_service.h" | |
14 #include "content/public/browser/content_browser_client.h" | 14 #include "content/public/browser/content_browser_client.h" |
15 #include "content/public/common/main_function_params.h" | 15 #include "content/public/common/main_function_params.h" |
16 #include "net/socket/client_socket_pool_base.h" | 16 #include "net/socket/client_socket_pool_base.h" |
17 #include "testing/gtest/include/gtest/gtest.h" | 17 #include "testing/gtest/include/gtest/gtest.h" |
18 | 18 |
19 class BrowserMainTest : public testing::Test { | 19 class BrowserMainTest : public testing::Test { |
20 public: | 20 public: |
21 BrowserMainTest() | 21 BrowserMainTest() |
22 : command_line_(CommandLine::NO_PROGRAM) { | 22 : command_line_(CommandLine::NO_PROGRAM) { |
23 ChromeBrowserMainParts::disable_enforcing_cookie_policies_for_tests_ = true; | 23 ChromeBrowserMainParts::disable_enforcing_cookie_policies_for_tests_ = true; |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 #if defined(NDEBUG) && defined(DCHECK_ALWAYS_ON) | 87 #if defined(NDEBUG) && defined(DCHECK_ALWAYS_ON) |
88 EXPECT_DEATH(parts->browser_field_trials_.WarmConnectionFieldTrial(), | 88 EXPECT_DEATH(parts->browser_field_trials_.WarmConnectionFieldTrial(), |
89 "Not a valid socket reuse policy group"); | 89 "Not a valid socket reuse policy group"); |
90 #else | 90 #else |
91 EXPECT_DEBUG_DEATH(parts->browser_field_trials_.WarmConnectionFieldTrial(), | 91 EXPECT_DEBUG_DEATH(parts->browser_field_trials_.WarmConnectionFieldTrial(), |
92 "Not a valid socket reuse policy group"); | 92 "Not a valid socket reuse policy group"); |
93 #endif | 93 #endif |
94 } | 94 } |
95 } | 95 } |
96 #endif | 96 #endif |
OLD | NEW |