| 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" |
| 11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
| 12 #include "chrome/browser/net/url_fixer_upper.h" | 12 #include "chrome/browser/net/url_fixer_upper.h" |
| 13 #include "chrome/common/chrome_constants.h" | 13 #include "chrome/common/chrome_constants.h" |
| 14 #include "chrome/common/chrome_paths.h" | 14 #include "chrome/common/chrome_paths.h" |
| 15 #include "chrome/common/chrome_switches.h" | 15 #include "chrome/common/chrome_switches.h" |
| 16 #include "chrome/test/automation/browser_proxy.h" | 16 #include "chrome/test/automation/browser_proxy.h" |
| 17 #include "chrome/test/automation/tab_proxy.h" | 17 #include "chrome/test/automation/tab_proxy.h" |
| 18 #include "chrome/test/automation/window_proxy.h" | 18 #include "chrome/test/automation/window_proxy.h" |
| 19 #include "chrome/test/chrome_process_util.h" | 19 #include "chrome/test/chrome_process_util.h" |
| 20 #include "chrome/test/ui/ui_test.h" | 20 #include "chrome/test/ui/ui_perf_test.h" |
| 21 #include "googleurl/src/gurl.h" | 21 #include "googleurl/src/gurl.h" |
| 22 #include "net/base/net_util.h" | 22 #include "net/base/net_util.h" |
| 23 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
| 24 | 24 |
| 25 namespace { | 25 namespace { |
| 26 | 26 |
| 27 static const FilePath::CharType kTempDirName[] = | 27 static const FilePath::CharType kTempDirName[] = |
| 28 FILE_PATH_LITERAL("memory_test_profile"); | 28 FILE_PATH_LITERAL("memory_test_profile"); |
| 29 | 29 |
| 30 class MemoryTest : public UITest { | 30 class MemoryTest : public UIPerfTest { |
| 31 public: | 31 public: |
| 32 MemoryTest() : cleanup_temp_dir_on_exit_(false) {} | 32 MemoryTest() : cleanup_temp_dir_on_exit_(false) {} |
| 33 | 33 |
| 34 ~MemoryTest() { | 34 ~MemoryTest() { |
| 35 // Cleanup our temporary directory. | 35 // Cleanup our temporary directory. |
| 36 if (cleanup_temp_dir_on_exit_) | 36 if (cleanup_temp_dir_on_exit_) |
| 37 file_util::Delete(temp_dir_, true); | 37 file_util::Delete(temp_dir_, true); |
| 38 } | 38 } |
| 39 | 39 |
| 40 // Called from SetUp() to determine the user data dir to copy. | 40 // Called from SetUp() to determine the user data dir to copy. |
| (...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 524 TEST_F(GeneralMixMemoryTest, TwelveTabTest) { | 524 TEST_F(GeneralMixMemoryTest, TwelveTabTest) { |
| 525 RunTest("_12t", 12); | 525 RunTest("_12t", 12); |
| 526 } | 526 } |
| 527 | 527 |
| 528 // Commented out until the recorded cache data is added. | 528 // Commented out until the recorded cache data is added. |
| 529 //TEST_F(MembusterMemoryTest, Windows) { | 529 //TEST_F(MembusterMemoryTest, Windows) { |
| 530 // RunTest("membuster", 0); | 530 // RunTest("membuster", 0); |
| 531 //} | 531 //} |
| 532 | 532 |
| 533 } // namespace | 533 } // namespace |
| OLD | NEW |