| 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 #include "chrome_frame/test/perf/chrome_frame_perftest.h" | 4 #include "chrome_frame/test/perf/chrome_frame_perftest.h" |
| 5 | 5 |
| 6 #include <atlwin.h> | 6 #include <atlwin.h> |
| 7 #include <atlhost.h> | 7 #include <atlhost.h> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 964 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 975 RegularChromeFrameActiveXMemoryTest; | 975 RegularChromeFrameActiveXMemoryTest; |
| 976 | 976 |
| 977 TEST_F(RegularChromeFrameActiveXMemoryTest, MemoryTestAboutBlank) { | 977 TEST_F(RegularChromeFrameActiveXMemoryTest, MemoryTestAboutBlank) { |
| 978 char *urls[] = {"about:blank"}; | 978 char *urls[] = {"about:blank"}; |
| 979 RunTest("memory_about_blank", urls, arraysize(urls)); | 979 RunTest("memory_about_blank", urls, arraysize(urls)); |
| 980 } | 980 } |
| 981 | 981 |
| 982 // TODO(iyengar) | 982 // TODO(iyengar) |
| 983 // Revisit why the chrome frame dll does not unload correctly when this test is | 983 // Revisit why the chrome frame dll does not unload correctly when this test is |
| 984 // run. | 984 // run. |
| 985 // http://code.google.com/p/chromium/issues/detail?id=47812 |
| 985 TEST_F(RegularChromeFrameActiveXMemoryTest, DISABLED_MemoryTestUrls) { | 986 TEST_F(RegularChromeFrameActiveXMemoryTest, DISABLED_MemoryTestUrls) { |
| 986 // TODO(iyengar) | 987 // TODO(iyengar) |
| 987 // We should use static pages to measure memory usage. | 988 // We should use static pages to measure memory usage. |
| 988 char *urls[] = { | 989 char *urls[] = { |
| 989 "http://www.youtube.com/watch?v=PN2HAroA12w", | 990 "http://www.youtube.com/watch?v=PN2HAroA12w", |
| 990 "http://www.youtube.com/watch?v=KmLJDrsaJmk&feature=channel" | 991 "http://www.youtube.com/watch?v=KmLJDrsaJmk&feature=channel" |
| 991 }; | 992 }; |
| 992 | 993 |
| 993 RunTest("memory", urls, arraysize(urls)); | 994 RunTest("memory", urls, arraysize(urls)); |
| 994 } | 995 } |
| 995 | 996 |
| 996 typedef ChromeFrameActiveXMemoryTest<ChromeFrameMemoryTestReference> | 997 typedef ChromeFrameActiveXMemoryTest<ChromeFrameMemoryTestReference> |
| 997 ReferenceBuildChromeFrameActiveXMemoryTest; | 998 ReferenceBuildChromeFrameActiveXMemoryTest; |
| 998 | 999 |
| 999 TEST_F(ReferenceBuildChromeFrameActiveXMemoryTest, MemoryTestAboutBlank) { | 1000 // Disabled to investigate why the chrome frame dll does not unload while |
| 1001 // running this test. |
| 1002 // http://code.google.com/p/chromium/issues/detail?id=47812 |
| 1003 TEST_F(ReferenceBuildChromeFrameActiveXMemoryTest, |
| 1004 DISABLED_MemoryTestAboutBlank) { |
| 1000 char *urls[] = {"about:blank"}; | 1005 char *urls[] = {"about:blank"}; |
| 1001 RunTest("memory_about_blank_reference", urls, arraysize(urls)); | 1006 RunTest("memory_about_blank_reference", urls, arraysize(urls)); |
| 1002 } | 1007 } |
| 1003 | 1008 |
| 1004 // TODO(iyengar) | 1009 // TODO(iyengar) |
| 1005 // Revisit why the chrome frame dll does not unload correctly when this test is | 1010 // Revisit why the chrome frame dll does not unload correctly when this test is |
| 1006 // run. | 1011 // run. |
| 1007 TEST_F(ReferenceBuildChromeFrameActiveXMemoryTest, DISABLED_MemoryTestUrls) { | 1012 TEST_F(ReferenceBuildChromeFrameActiveXMemoryTest, DISABLED_MemoryTestUrls) { |
| 1008 // TODO(iyengar) | 1013 // TODO(iyengar) |
| 1009 // We should use static pages to measure memory usage. | 1014 // We should use static pages to measure memory usage. |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1074 ASSERT_TRUE(silverlight_key.ReadValue(L"", &plugin_path)); | 1079 ASSERT_TRUE(silverlight_key.ReadValue(L"", &plugin_path)); |
| 1075 ASSERT_FALSE(plugin_path.empty()); | 1080 ASSERT_FALSE(plugin_path.empty()); |
| 1076 | 1081 |
| 1077 FilePath silverlight_path = FilePath::FromWStringHack(plugin_path); | 1082 FilePath silverlight_path = FilePath::FromWStringHack(plugin_path); |
| 1078 FilePath binaries_to_evict[] = {silverlight_path}; | 1083 FilePath binaries_to_evict[] = {silverlight_path}; |
| 1079 | 1084 |
| 1080 RunStartupTest("creation_cold", "t_silverlight", "", true /* cold */, | 1085 RunStartupTest("creation_cold", "t_silverlight", "", true /* cold */, |
| 1081 arraysize(binaries_to_evict), binaries_to_evict, | 1086 arraysize(binaries_to_evict), binaries_to_evict, |
| 1082 false /* important */, true); | 1087 false /* important */, true); |
| 1083 } | 1088 } |
| OLD | NEW |