| 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 | 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" |
| 11 | 11 |
| 12 // Tabs is flaky on chromeos debug build. | 12 // Tabs is flaky on chromeos and linux views debug build. |
| 13 // http://crbug.com/48920 | 13 // http://crbug.com/48920 |
| 14 #if defined(OS_CHROMEOS) && !defined(NDEBUG) | 14 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) && !defined(NDEBUG) |
| 15 #define MAYBE_Tabs FLAKY_Tabs | 15 #define MAYBE_Tabs FLAKY_Tabs |
| 16 #else | 16 #else |
| 17 #define MAYBE_Tabs Tabs | 17 #define MAYBE_Tabs Tabs |
| 18 #endif | 18 #endif |
| 19 | 19 |
| 20 | 20 |
| 21 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs) { | 21 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs) { |
| 22 ASSERT_TRUE(StartHTTPServer()); | 22 ASSERT_TRUE(StartHTTPServer()); |
| 23 | 23 |
| 24 // The test creates a tab and checks that the URL of the new tab | 24 // The test creates a tab and checks that the URL of the new tab |
| (...skipping 23 matching lines...) Expand all Loading... |
| 48 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CaptureVisibleTab) { | 48 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CaptureVisibleTab) { |
| 49 ASSERT_TRUE(StartHTTPServer()); | 49 ASSERT_TRUE(StartHTTPServer()); |
| 50 ASSERT_TRUE(RunExtensionTest("tabs/capture_visible_tab")) << message_; | 50 ASSERT_TRUE(RunExtensionTest("tabs/capture_visible_tab")) << message_; |
| 51 } | 51 } |
| 52 | 52 |
| 53 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabsOnUpdated) { | 53 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabsOnUpdated) { |
| 54 ASSERT_TRUE(StartHTTPServer()); | 54 ASSERT_TRUE(StartHTTPServer()); |
| 55 | 55 |
| 56 ASSERT_TRUE(RunExtensionTest("tabs/on_updated")) << message_; | 56 ASSERT_TRUE(RunExtensionTest("tabs/on_updated")) << message_; |
| 57 } | 57 } |
| OLD | NEW |