| OLD | NEW |
| 1 // Copyright (c) 2009 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 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 25 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabGetCurrent) { | 25 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabGetCurrent) { |
| 26 ASSERT_TRUE(StartHTTPServer()); | 26 ASSERT_TRUE(StartHTTPServer()); |
| 27 ASSERT_TRUE(RunExtensionTest("tabs/get_current")) << message_; | 27 ASSERT_TRUE(RunExtensionTest("tabs/get_current")) << message_; |
| 28 } | 28 } |
| 29 | 29 |
| 30 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabConnect) { | 30 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabConnect) { |
| 31 ASSERT_TRUE(StartHTTPServer()); | 31 ASSERT_TRUE(StartHTTPServer()); |
| 32 ASSERT_TRUE(RunExtensionTest("tabs/connect")) << message_; | 32 ASSERT_TRUE(RunExtensionTest("tabs/connect")) << message_; |
| 33 } | 33 } |
| 34 | 34 |
| 35 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) | |
| 36 // The way ChromeOs deals with browser windows breaks this test. | |
| 37 // http://crbug.com/43440. | |
| 38 #define MAYBE_TabOnRemoved DISABLED_TabOnRemoved | |
| 39 #else | |
| 40 #define MAYBE_TabOnRemoved TabOnRemoved | |
| 41 #endif | |
| 42 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabOnRemoved) { | 35 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabOnRemoved) { |
| 43 ASSERT_TRUE(StartHTTPServer()); | 36 ASSERT_TRUE(StartHTTPServer()); |
| 44 ASSERT_TRUE(RunExtensionTest("tabs/on_removed")) << message_; | 37 ASSERT_TRUE(RunExtensionTest("tabs/on_removed")) << message_; |
| 45 } | 38 } |
| 46 | 39 |
| 47 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CaptureVisibleTab) { | 40 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CaptureVisibleTab) { |
| 48 ASSERT_TRUE(StartHTTPServer()); | 41 ASSERT_TRUE(StartHTTPServer()); |
| 49 ASSERT_TRUE(RunExtensionTest("tabs/capture_visible_tab")) << message_; | 42 ASSERT_TRUE(RunExtensionTest("tabs/capture_visible_tab")) << message_; |
| 50 } | 43 } |
| 51 | 44 |
| 52 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabsOnUpdated) { | 45 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabsOnUpdated) { |
| 53 ASSERT_TRUE(StartHTTPServer()); | 46 ASSERT_TRUE(StartHTTPServer()); |
| 54 | 47 |
| 55 ASSERT_TRUE(RunExtensionTest("tabs/on_updated")) << message_; | 48 ASSERT_TRUE(RunExtensionTest("tabs/on_updated")) << message_; |
| 56 } | 49 } |
| OLD | NEW |