| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/process_util.h" | 10 #include "base/process_util.h" |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 #if defined(OS_WIN) | 109 #if defined(OS_WIN) |
| 110 browser_dir = browser_dir.AppendASCII("chrome"); | 110 browser_dir = browser_dir.AppendASCII("chrome"); |
| 111 #elif defined(OS_LINUX) | 111 #elif defined(OS_LINUX) |
| 112 browser_dir = browser_dir.AppendASCII("chrome_linux"); | 112 browser_dir = browser_dir.AppendASCII("chrome_linux"); |
| 113 #elif defined(OS_MACOSX) | 113 #elif defined(OS_MACOSX) |
| 114 browser_dir = browser_dir.AppendASCII("chrome_mac"); | 114 browser_dir = browser_dir.AppendASCII("chrome_mac"); |
| 115 #endif | 115 #endif |
| 116 browser_directory_ = browser_dir; | 116 browser_directory_ = browser_dir; |
| 117 } | 117 } |
| 118 | 118 |
| 119 launch_arguments_.AppendSwitchWithValue(switches::kUserDataDir, | 119 launch_arguments_.AppendSwitchPath(switches::kUserDataDir, user_data_dir_); |
| 120 user_data_dir_.ToWStringHack()); | |
| 121 UITest::SetUp(); | 120 UITest::SetUp(); |
| 122 } | 121 } |
| 123 | 122 |
| 124 // This memory test loads a set of URLs across a set of tabs, maintaining the | 123 // This memory test loads a set of URLs across a set of tabs, maintaining the |
| 125 // number of concurrent open tabs at num_target_tabs. | 124 // number of concurrent open tabs at num_target_tabs. |
| 126 // <NEWTAB> is a special URL which informs the loop when we should create a | 125 // <NEWTAB> is a special URL which informs the loop when we should create a |
| 127 // new tab. | 126 // new tab. |
| 128 // <PAUSE> is a special URL that informs the loop to pause before proceeding | 127 // <PAUSE> is a special URL that informs the loop to pause before proceeding |
| 129 // to the next URL. | 128 // to the next URL. |
| 130 void RunTest(const char* test_name, int num_target_tabs) { | 129 void RunTest(const char* test_name, int num_target_tabs) { |
| (...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 525 TEST_F(GeneralMixMemoryTest, TwelveTabTest) { | 524 TEST_F(GeneralMixMemoryTest, TwelveTabTest) { |
| 526 RunTest("_12t", 12); | 525 RunTest("_12t", 12); |
| 527 } | 526 } |
| 528 | 527 |
| 529 // Commented out until the recorded cache data is added. | 528 // Commented out until the recorded cache data is added. |
| 530 //TEST_F(MembusterMemoryTest, Windows) { | 529 //TEST_F(MembusterMemoryTest, Windows) { |
| 531 // RunTest("membuster", 0); | 530 // RunTest("membuster", 0); |
| 532 //} | 531 //} |
| 533 | 532 |
| 534 } // namespace | 533 } // namespace |
| OLD | NEW |