OLD | NEW |
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/test/ui/ui_perf_test.h" | 5 #include "chrome/test/ui/ui_perf_test.h" |
6 | 6 |
7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
9 #include "chrome/common/chrome_paths.h" | 9 #include "chrome/common/chrome_paths.h" |
10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
11 #include "chrome/test/chrome_process_util.h" | 11 #include "chrome/test/chrome_process_util.h" |
| 12 #include "chrome/test/test_switches.h" |
12 | 13 |
13 void UIPerfTest::SetLaunchSwitches() { | 14 void UIPerfTest::SetLaunchSwitches() { |
14 UITestBase::SetLaunchSwitches(); | 15 UITestBase::SetLaunchSwitches(); |
15 | 16 |
16 // Reduce performance test variance by disabling background networking. | 17 // Reduce performance test variance by disabling background networking. |
17 launch_arguments_.AppendSwitch(switches::kDisableBackgroundNetworking); | 18 launch_arguments_.AppendSwitch(switches::kDisableBackgroundNetworking); |
18 } | 19 } |
19 | 20 |
20 void UIPerfTest::PrintResult(const std::string& measurement, | 21 void UIPerfTest::PrintResult(const std::string& measurement, |
21 const std::string& modifier, | 22 const std::string& modifier, |
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 FilePath dir; | 326 FilePath dir; |
326 PathService::Get(chrome::DIR_TEST_TOOLS, &dir); | 327 PathService::Get(chrome::DIR_TEST_TOOLS, &dir); |
327 dir = dir.AppendASCII("reference_build"); | 328 dir = dir.AppendASCII("reference_build"); |
328 #if defined(OS_WIN) | 329 #if defined(OS_WIN) |
329 dir = dir.AppendASCII("chrome"); | 330 dir = dir.AppendASCII("chrome"); |
330 #elif defined(OS_LINUX) | 331 #elif defined(OS_LINUX) |
331 dir = dir.AppendASCII("chrome_linux"); | 332 dir = dir.AppendASCII("chrome_linux"); |
332 #elif defined(OS_MACOSX) | 333 #elif defined(OS_MACOSX) |
333 dir = dir.AppendASCII("chrome_mac"); | 334 dir = dir.AppendASCII("chrome_mac"); |
334 #endif | 335 #endif |
| 336 launch_arguments_.AppendSwitch(switches::kEnableChromiumBranding); |
335 SetBrowserDirectory(dir); | 337 SetBrowserDirectory(dir); |
336 } | 338 } |
OLD | NEW |