Chromium Code Reviews| 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 15 matching lines...) Expand all Loading... | |
| 26 protected: | 26 protected: |
| 27 TestingPrefService pref_service_; | 27 TestingPrefService pref_service_; |
| 28 CommandLine command_line_; | 28 CommandLine command_line_; |
| 29 }; | 29 }; |
| 30 | 30 |
| 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( |
|
jar (doing other things)
2012/08/17 19:06:19
nit: use descriptive names, not abbreviations such
Alexei Svitkine (slow)
2012/08/20 15:57:40
Done.
| |
| 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()); |
|
jar (doing other things)
2012/08/17 19:06:19
nit: |cbw| --> descriptive name
Alexei Svitkine (slow)
2012/08/20 15:57:40
Done.
| |
| 39 EXPECT_TRUE(cbw); | 39 EXPECT_TRUE(cbw); |
| 40 if (cbw) { | 40 if (cbw) { |
| 41 base::FieldTrialList field_trial_list_(NULL); | |
| 41 cbw->browser_field_trials_.WarmConnectionFieldTrial(); | 42 cbw->browser_field_trials_.WarmConnectionFieldTrial(); |
| 42 EXPECT_EQ(0, net::GetSocketReusePolicy()); | 43 EXPECT_EQ(0, net::GetSocketReusePolicy()); |
| 43 } | 44 } |
| 44 } | 45 } |
| 45 | 46 |
| 46 TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Random) { | 47 TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Random) { |
| 47 scoped_ptr<content::MainFunctionParams> params( | 48 scoped_ptr<content::MainFunctionParams> params( |
| 48 new content::MainFunctionParams(command_line_)); | 49 new content::MainFunctionParams(command_line_)); |
| 49 scoped_ptr<content::BrowserMainParts> bw( | 50 scoped_ptr<content::BrowserMainParts> bw( |
| 50 content::GetContentClient()->browser()->CreateBrowserMainParts(*params)); | 51 content::GetContentClient()->browser()->CreateBrowserMainParts(*params)); |
| 51 ChromeBrowserMainParts* cbw = static_cast<ChromeBrowserMainParts*>(bw.get()); | 52 ChromeBrowserMainParts* cbw = static_cast<ChromeBrowserMainParts*>(bw.get()); |
|
jar (doing other things)
2012/08/17 19:06:19
nit: use descriptive names for variables (line 50
Alexei Svitkine (slow)
2012/08/20 15:57:40
Done. I didn't write this code, but I shaved the y
| |
| 52 EXPECT_TRUE(cbw); | 53 EXPECT_TRUE(cbw); |
| 53 if (cbw) { | 54 if (cbw) { |
| 54 const int kNumRuns = 1000; | 55 const int kNumRuns = 1000; |
| 55 for (int i = 0; i < kNumRuns; i++) { | 56 for (int i = 0; i < kNumRuns; i++) { |
| 57 base::FieldTrialList field_trial_list_(NULL); | |
| 56 cbw->browser_field_trials_.WarmConnectionFieldTrial(); | 58 cbw->browser_field_trials_.WarmConnectionFieldTrial(); |
| 57 int val = net::GetSocketReusePolicy(); | 59 int val = net::GetSocketReusePolicy(); |
| 58 EXPECT_LE(val, 2); | 60 EXPECT_LE(val, 2); |
| 59 EXPECT_GE(val, 0); | 61 EXPECT_GE(val, 0); |
| 60 } | 62 } |
| 61 } | 63 } |
| 62 } | 64 } |
| 63 #if GTEST_HAS_DEATH_TEST | 65 #if GTEST_HAS_DEATH_TEST |
| 64 TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Invalid) { | 66 TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Invalid) { |
| 65 command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "100"); | 67 command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "100"); |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 82 #if defined(NDEBUG) && defined(DCHECK_ALWAYS_ON) | 84 #if defined(NDEBUG) && defined(DCHECK_ALWAYS_ON) |
| 83 EXPECT_DEATH(cbw->browser_field_trials_.WarmConnectionFieldTrial(), | 85 EXPECT_DEATH(cbw->browser_field_trials_.WarmConnectionFieldTrial(), |
| 84 "Not a valid socket reuse policy group"); | 86 "Not a valid socket reuse policy group"); |
| 85 #else | 87 #else |
| 86 EXPECT_DEBUG_DEATH(cbw->browser_field_trials_.WarmConnectionFieldTrial(), | 88 EXPECT_DEBUG_DEATH(cbw->browser_field_trials_.WarmConnectionFieldTrial(), |
| 87 "Not a valid socket reuse policy group"); | 89 "Not a valid socket reuse policy group"); |
| 88 #endif | 90 #endif |
| 89 } | 91 } |
| 90 } | 92 } |
| 91 #endif | 93 #endif |
| OLD | NEW |