| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/prefs/pref_service.h" | 7 #include "chrome/browser/prefs/pref_service.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabConnect) { | 90 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabConnect) { |
| 91 ASSERT_TRUE(StartTestServer()); | 91 ASSERT_TRUE(StartTestServer()); |
| 92 ASSERT_TRUE(RunExtensionTest("tabs/connect")) << message_; | 92 ASSERT_TRUE(RunExtensionTest("tabs/connect")) << message_; |
| 93 } | 93 } |
| 94 | 94 |
| 95 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabOnRemoved) { | 95 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabOnRemoved) { |
| 96 ASSERT_TRUE(StartTestServer()); | 96 ASSERT_TRUE(StartTestServer()); |
| 97 ASSERT_TRUE(RunExtensionTest("tabs/on_removed")) << message_; | 97 ASSERT_TRUE(RunExtensionTest("tabs/on_removed")) << message_; |
| 98 } | 98 } |
| 99 | 99 |
| 100 // Test is flaky. See http://crbug.com/83876 | 100 // Test is timing out on cros and flaky on others. See http://crbug.com/83876 |
| 101 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_CaptureVisibleTabJpeg) { | 101 #if defined(OS_CHROMEOS) |
| 102 #define MAYBE_CaptureVisibleTabJpeg DISABLED_CaptureVisibleTabJpeg |
| 103 #else |
| 104 #define MAYBE_CaptureVisibleTabJpeg FLAKY_CaptureVisibleTabJpeg |
| 105 #endif |
| 106 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTabJpeg) { |
| 102 host_resolver()->AddRule("a.com", "127.0.0.1"); | 107 host_resolver()->AddRule("a.com", "127.0.0.1"); |
| 103 host_resolver()->AddRule("b.com", "127.0.0.1"); | 108 host_resolver()->AddRule("b.com", "127.0.0.1"); |
| 104 ASSERT_TRUE(StartTestServer()); | 109 ASSERT_TRUE(StartTestServer()); |
| 105 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", | 110 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", |
| 106 "test_jpeg.html")) << message_; | 111 "test_jpeg.html")) << message_; |
| 107 } | 112 } |
| 108 | 113 |
| 109 // Test is flaky. See http://crbug.com/83876 | 114 // Test is flaky. See http://crbug.com/83876 |
| 110 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_CaptureVisibleTabPng) { | 115 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_CaptureVisibleTabPng) { |
| 111 host_resolver()->AddRule("a.com", "127.0.0.1"); | 116 host_resolver()->AddRule("a.com", "127.0.0.1"); |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedPopup) { | 169 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedPopup) { |
| 165 ASSERT_TRUE(StartTestServer()); | 170 ASSERT_TRUE(StartTestServer()); |
| 166 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_popup.html")) | 171 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_popup.html")) |
| 167 << message_; | 172 << message_; |
| 168 } | 173 } |
| 169 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedWindow) { | 174 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedWindow) { |
| 170 ASSERT_TRUE(StartTestServer()); | 175 ASSERT_TRUE(StartTestServer()); |
| 171 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) | 176 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) |
| 172 << message_; | 177 << message_; |
| 173 } | 178 } |
| OLD | NEW |