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 "chrome/browser/chrome_browser_main.h" | 10 #include "chrome/browser/chrome_browser_main.h" |
(...skipping 20 matching lines...) Expand all Loading... |
31 TEST_F(BrowserMainTest, WarmConnectionFieldTrial_WarmestSocket) { | 31 TEST_F(BrowserMainTest, WarmConnectionFieldTrial_WarmestSocket) { |
32 command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "0"); | 32 command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "0"); |
33 | 33 |
34 scoped_ptr<content::MainFunctionParams> params( | 34 scoped_ptr<content::MainFunctionParams> params( |
35 new content::MainFunctionParams(command_line_)); | 35 new content::MainFunctionParams(command_line_)); |
36 scoped_ptr<content::BrowserMainParts> bw( | 36 scoped_ptr<content::BrowserMainParts> bw( |
37 content::GetContentClient()->browser()->CreateBrowserMainParts(*params)); | 37 content::GetContentClient()->browser()->CreateBrowserMainParts(*params)); |
38 ChromeBrowserMainParts* cbw = static_cast<ChromeBrowserMainParts*>(bw.get()); | 38 ChromeBrowserMainParts* cbw = static_cast<ChromeBrowserMainParts*>(bw.get()); |
39 EXPECT_TRUE(cbw); | 39 EXPECT_TRUE(cbw); |
40 if (cbw) { | 40 if (cbw) { |
41 cbw->WarmConnectionFieldTrial(); | 41 cbw->browser_field_trials_.WarmConnectionFieldTrial(); |
42 EXPECT_EQ(0, net::GetSocketReusePolicy()); | 42 EXPECT_EQ(0, net::GetSocketReusePolicy()); |
43 } | 43 } |
44 } | 44 } |
45 | 45 |
46 TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Random) { | 46 TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Random) { |
47 scoped_ptr<content::MainFunctionParams> params( | 47 scoped_ptr<content::MainFunctionParams> params( |
48 new content::MainFunctionParams(command_line_)); | 48 new content::MainFunctionParams(command_line_)); |
49 scoped_ptr<content::BrowserMainParts> bw( | 49 scoped_ptr<content::BrowserMainParts> bw( |
50 content::GetContentClient()->browser()->CreateBrowserMainParts(*params)); | 50 content::GetContentClient()->browser()->CreateBrowserMainParts(*params)); |
51 ChromeBrowserMainParts* cbw = static_cast<ChromeBrowserMainParts*>(bw.get()); | 51 ChromeBrowserMainParts* cbw = static_cast<ChromeBrowserMainParts*>(bw.get()); |
52 EXPECT_TRUE(cbw); | 52 EXPECT_TRUE(cbw); |
53 if (cbw) { | 53 if (cbw) { |
54 const int kNumRuns = 1000; | 54 const int kNumRuns = 1000; |
55 for (int i = 0; i < kNumRuns; i++) { | 55 for (int i = 0; i < kNumRuns; i++) { |
56 cbw->WarmConnectionFieldTrial(); | 56 cbw->browser_field_trials_.WarmConnectionFieldTrial(); |
57 int val = net::GetSocketReusePolicy(); | 57 int val = net::GetSocketReusePolicy(); |
58 EXPECT_LE(val, 2); | 58 EXPECT_LE(val, 2); |
59 EXPECT_GE(val, 0); | 59 EXPECT_GE(val, 0); |
60 } | 60 } |
61 } | 61 } |
62 } | 62 } |
63 #if GTEST_HAS_DEATH_TEST | 63 #if GTEST_HAS_DEATH_TEST |
64 TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Invalid) { | 64 TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Invalid) { |
65 command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "100"); | 65 command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "100"); |
66 | 66 |
67 scoped_ptr<content::MainFunctionParams> params( | 67 scoped_ptr<content::MainFunctionParams> params( |
68 new content::MainFunctionParams(command_line_)); | 68 new content::MainFunctionParams(command_line_)); |
69 // This test ends up launching a new process, and that doesn't initialize the | 69 // This test ends up launching a new process, and that doesn't initialize the |
70 // ContentClient interfaces. | 70 // ContentClient interfaces. |
71 scoped_ptr<content::BrowserMainParts> bw; | 71 scoped_ptr<content::BrowserMainParts> bw; |
72 if (content::GetContentClient()) { | 72 if (content::GetContentClient()) { |
73 bw.reset(content::GetContentClient()->browser()->CreateBrowserMainParts( | 73 bw.reset(content::GetContentClient()->browser()->CreateBrowserMainParts( |
74 *params)); | 74 *params)); |
75 } else { | 75 } else { |
76 chrome::ChromeContentBrowserClient ccbc; | 76 chrome::ChromeContentBrowserClient ccbc; |
77 bw.reset(ccbc.CreateBrowserMainParts(*params)); | 77 bw.reset(ccbc.CreateBrowserMainParts(*params)); |
78 } | 78 } |
79 ChromeBrowserMainParts* cbw = static_cast<ChromeBrowserMainParts*>(bw.get()); | 79 ChromeBrowserMainParts* cbw = static_cast<ChromeBrowserMainParts*>(bw.get()); |
80 EXPECT_TRUE(cbw); | 80 EXPECT_TRUE(cbw); |
81 if (cbw) { | 81 if (cbw) { |
82 #if defined(NDEBUG) && defined(DCHECK_ALWAYS_ON) | 82 #if defined(NDEBUG) && defined(DCHECK_ALWAYS_ON) |
83 EXPECT_DEATH(cbw->WarmConnectionFieldTrial(), | 83 EXPECT_DEATH(cbw->browser_field_trials_.WarmConnectionFieldTrial(), |
84 "Not a valid socket reuse policy group"); | 84 "Not a valid socket reuse policy group"); |
85 #else | 85 #else |
86 EXPECT_DEBUG_DEATH(cbw->WarmConnectionFieldTrial(), | 86 EXPECT_DEBUG_DEATH(cbw->browser_field_trials_.WarmConnectionFieldTrial(), |
87 "Not a valid socket reuse policy group"); | 87 "Not a valid socket reuse policy group"); |
88 #endif | 88 #endif |
89 } | 89 } |
90 } | 90 } |
91 #endif | 91 #endif |
OLD | NEW |