| 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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 // test. | 136 // test. |
| 137 size_t start_size = base::GetSystemCommitCharge(); | 137 size_t start_size = base::GetSystemCommitCharge(); |
| 138 | 138 |
| 139 // Cycle through the URLs. | 139 // Cycle through the URLs. |
| 140 scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0)); | 140 scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0)); |
| 141 int active_window = 0; // The index of the window we are currently using. | 141 int active_window = 0; // The index of the window we are currently using. |
| 142 scoped_refptr<TabProxy> tab(window->GetActiveTab()); | 142 scoped_refptr<TabProxy> tab(window->GetActiveTab()); |
| 143 int expected_tab_count = 1; | 143 int expected_tab_count = 1; |
| 144 for (unsigned counter = 0; counter < urls_length; ++counter) { | 144 for (unsigned counter = 0; counter < urls_length; ++counter) { |
| 145 std::string url = urls[counter]; | 145 std::string url = urls[counter]; |
| 146 | 146 |
| 147 SCOPED_TRACE(url); | 147 SCOPED_TRACE(url); |
| 148 | 148 |
| 149 if (url == "<PAUSE>") { // Special command to delay on this page | 149 if (url == "<PAUSE>") { // Special command to delay on this page |
| 150 PlatformThread::Sleep(2000); | 150 PlatformThread::Sleep(2000); |
| 151 continue; | 151 continue; |
| 152 } | 152 } |
| 153 | 153 |
| 154 if (url == "<NEWTAB>") { // Special command to create a new tab | 154 if (url == "<NEWTAB>") { // Special command to create a new tab |
| 155 if (++counter >= urls_length) | 155 if (++counter >= urls_length) |
| 156 continue; // Newtab was specified at end of list. ignore. | 156 continue; // Newtab was specified at end of list. ignore. |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 525 TEST_F(GeneralMixMemoryTest, TwelveTabTest) { | 525 TEST_F(GeneralMixMemoryTest, TwelveTabTest) { |
| 526 RunTest("_12t", 12); | 526 RunTest("_12t", 12); |
| 527 } | 527 } |
| 528 | 528 |
| 529 // Commented out until the recorded cache data is added. | 529 // Commented out until the recorded cache data is added. |
| 530 //TEST_F(MembusterMemoryTest, Windows) { | 530 //TEST_F(MembusterMemoryTest, Windows) { |
| 531 // RunTest("membuster", 0); | 531 // RunTest("membuster", 0); |
| 532 //} | 532 //} |
| 533 | 533 |
| 534 } // namespace | 534 } // namespace |
| OLD | NEW |