OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "chrome/browser/extensions/extension_apitest.h" | 5 #include "chrome/browser/extensions/extension_apitest.h" |
6 | 6 |
7 #include "chrome/browser/browser.h" | 7 #include "chrome/browser/browser.h" |
8 #include "chrome/browser/pref_service.h" | 8 #include "chrome/browser/pref_service.h" |
9 #include "chrome/browser/profile.h" | 9 #include "chrome/browser/profile.h" |
10 #include "chrome/common/pref_names.h" | 10 #include "chrome/common/pref_names.h" |
(...skipping 20 matching lines...) Expand all Loading... |
31 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs2) { | 31 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs2) { |
32 StartHTTPServer(); | 32 StartHTTPServer(); |
33 | 33 |
34 // This test runs through additional tabs functionality. | 34 // This test runs through additional tabs functionality. |
35 browser()->profile()->GetPrefs()->SetBoolean( | 35 browser()->profile()->GetPrefs()->SetBoolean( |
36 prefs::kHomePageIsNewTabPage, true); | 36 prefs::kHomePageIsNewTabPage, true); |
37 | 37 |
38 ASSERT_TRUE(RunExtensionTest("tabs/basics2")) << message_; | 38 ASSERT_TRUE(RunExtensionTest("tabs/basics2")) << message_; |
39 } | 39 } |
40 | 40 |
41 // TODO(skerner): This test is flaky on chrome os: http://crbug.com/41380 | 41 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CaptureVisibleTab) { |
42 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) | |
43 #define MAYBE_CaptureVisibleTab FLAKY_CaptureVisibleTab | |
44 #else | |
45 #define MAYBE_CaptureVisibleTab CaptureVisibleTab | |
46 #endif | |
47 | |
48 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTab) { | |
49 StartHTTPServer(); | 42 StartHTTPServer(); |
50 | 43 |
51 ASSERT_TRUE(RunExtensionTest("tabs/capture_visible_tab")) << message_; | 44 ASSERT_TRUE(RunExtensionTest("tabs/capture_visible_tab")) << message_; |
52 } | 45 } |
OLD | NEW |