| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "base/environment.h" | 5 #include "base/environment.h" |
| 6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/platform_thread.h" | 8 #include "base/platform_thread.h" |
| 9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
| 10 #include "base/string_split.h" | 10 #include "base/string_split.h" |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 NOTIMPLEMENTED() << "gears not enabled yet"; | 153 NOTIMPLEMENTED() << "gears not enabled yet"; |
| 154 #endif | 154 #endif |
| 155 } | 155 } |
| 156 UITest::SetUp(); | 156 UITest::SetUp(); |
| 157 TimeTicks end_time = TimeTicks::Now(); | 157 TimeTicks end_time = TimeTicks::Now(); |
| 158 | 158 |
| 159 // HACK: Chrome < 5.0.368.0 did not yet implement SendJSONRequest. | 159 // HACK: Chrome < 5.0.368.0 did not yet implement SendJSONRequest. |
| 160 { | 160 { |
| 161 std::string server_version = automation()->server_version(); | 161 std::string server_version = automation()->server_version(); |
| 162 std::vector<std::string> version_numbers; | 162 std::vector<std::string> version_numbers; |
| 163 SplitString(server_version, '.', &version_numbers); | 163 base::SplitString(server_version, '.', &version_numbers); |
| 164 int chrome_buildnum = 0; | 164 int chrome_buildnum = 0; |
| 165 ASSERT_TRUE(base::StringToInt(version_numbers[2], &chrome_buildnum)); | 165 ASSERT_TRUE(base::StringToInt(version_numbers[2], &chrome_buildnum)); |
| 166 if (chrome_buildnum < 368) { | 166 if (chrome_buildnum < 368) { |
| 167 num_tabs = 0; | 167 num_tabs = 0; |
| 168 } | 168 } |
| 169 } | 169 } |
| 170 if (num_tabs > 0) { | 170 if (num_tabs > 0) { |
| 171 float min_start; | 171 float min_start; |
| 172 float max_stop; | 172 float max_stop; |
| 173 std::vector<float> times; | 173 std::vector<float> times; |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 397 UITest::CUSTOM_FRAME, 0, 0); | 397 UITest::CUSTOM_FRAME, 0, 0); |
| 398 } | 398 } |
| 399 | 399 |
| 400 TEST_F(StartupTest, PerfNativeFrameGtkTheme) { | 400 TEST_F(StartupTest, PerfNativeFrameGtkTheme) { |
| 401 RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT, | 401 RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT, |
| 402 UITest::CUSTOM_FRAME_NATIVE_THEME, 0, 0); | 402 UITest::CUSTOM_FRAME_NATIVE_THEME, 0, 0); |
| 403 } | 403 } |
| 404 #endif | 404 #endif |
| 405 | 405 |
| 406 } // namespace | 406 } // namespace |
| OLD | NEW |