| 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 #endif | 106 #endif |
| 107 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTabJpeg) { | 107 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTabJpeg) { |
| 108 host_resolver()->AddRule("a.com", "127.0.0.1"); | 108 host_resolver()->AddRule("a.com", "127.0.0.1"); |
| 109 host_resolver()->AddRule("b.com", "127.0.0.1"); | 109 host_resolver()->AddRule("b.com", "127.0.0.1"); |
| 110 ASSERT_TRUE(StartTestServer()); | 110 ASSERT_TRUE(StartTestServer()); |
| 111 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", | 111 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", |
| 112 "test_jpeg.html")) << message_; | 112 "test_jpeg.html")) << message_; |
| 113 } | 113 } |
| 114 | 114 |
| 115 // Test is timing out on cros and flaky on others. See http://crbug.com/83876 | 115 // Test is timing out on cros and flaky on others. See http://crbug.com/83876 |
| 116 #if defined(OS_CHROMEOS) | 116 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) |
| 117 #define MAYBE_CaptureVisibleTabPng DISABLED_CaptureVisibleTabPng | 117 #define MAYBE_CaptureVisibleTabPng DISABLED_CaptureVisibleTabPng |
| 118 #else | 118 #else |
| 119 #define MAYBE_CaptureVisibleTabPng FLAKY_CaptureVisibleTabPng | 119 #define MAYBE_CaptureVisibleTabPng FLAKY_CaptureVisibleTabPng |
| 120 #endif | 120 #endif |
| 121 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTabPng) { | 121 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTabPng) { |
| 122 host_resolver()->AddRule("a.com", "127.0.0.1"); | 122 host_resolver()->AddRule("a.com", "127.0.0.1"); |
| 123 host_resolver()->AddRule("b.com", "127.0.0.1"); | 123 host_resolver()->AddRule("b.com", "127.0.0.1"); |
| 124 ASSERT_TRUE(StartTestServer()); | 124 ASSERT_TRUE(StartTestServer()); |
| 125 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", | 125 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", |
| 126 "test_png.html")) << message_; | 126 "test_png.html")) << message_; |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedPopup) { | 175 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedPopup) { |
| 176 ASSERT_TRUE(StartTestServer()); | 176 ASSERT_TRUE(StartTestServer()); |
| 177 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_popup.html")) | 177 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_popup.html")) |
| 178 << message_; | 178 << message_; |
| 179 } | 179 } |
| 180 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedWindow) { | 180 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedWindow) { |
| 181 ASSERT_TRUE(StartTestServer()); | 181 ASSERT_TRUE(StartTestServer()); |
| 182 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) | 182 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) |
| 183 << message_; | 183 << message_; |
| 184 } | 184 } |
| OLD | NEW |