summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorskerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-15 19:08:22 +0000
committerskerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-15 19:08:22 +0000
commitca7272b8db0d425979bd1853cea37e0379d6baf8 (patch)
tree6e09b91429a55484f4dcc2a4afd02a290074c534 /chrome/browser/extensions
parent9aa2eaaeadd97c8ed9018a63ca701a42eb731c9b (diff)
downloadchromium_src-ca7272b8db0d425979bd1853cea37e0379d6baf8.zip
chromium_src-ca7272b8db0d425979bd1853cea37e0379d6baf8.tar.gz
chromium_src-ca7272b8db0d425979bd1853cea37e0379d6baf8.tar.bz2
Fix chrome os flakyness for test ExtensionApiTest.CaptureVisibleTab.
While in the code, add tests for PNG capture, and make code test that the resulting image is the right color. BUG=41380 TEST=ExtensionApiTest.CaptureVisibleTab Review URL: http://codereview.chromium.org/1631015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44681 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_tabs_apitest.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
index 64d42ed..c50fbd9 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -38,14 +38,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs2) {
ASSERT_TRUE(RunExtensionTest("tabs/basics2")) << message_;
}
-// TODO(skerner): This test is flaky on chrome os: http://crbug.com/41380
-#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
-#define MAYBE_CaptureVisibleTab FLAKY_CaptureVisibleTab
-#else
-#define MAYBE_CaptureVisibleTab CaptureVisibleTab
-#endif
-
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTab) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CaptureVisibleTab) {
StartHTTPServer();
ASSERT_TRUE(RunExtensionTest("tabs/capture_visible_tab")) << message_;