Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(534)

Side by Side Diff: chrome/browser/apps/app_window_browsertest.cc

Issue 2460063002: Disable failing tests on Mac 10.10 and 10.11 after swarming. (Closed)
Patch Set: fix mac build Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/api/tabs/tabs_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "build/build_config.h" 5 #include "build/build_config.h"
6 #include "chrome/browser/apps/app_browsertest_util.h" 6 #include "chrome/browser/apps/app_browsertest_util.h"
7 #include "chrome/browser/profiles/profile.h" 7 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/extensions/app_launch_params.h" 9 #include "chrome/browser/ui/extensions/app_launch_params.h"
10 #include "chrome/browser/ui/extensions/application_launch.h" 10 #include "chrome/browser/ui/extensions/application_launch.h"
11 #include "content/public/browser/notification_service.h" 11 #include "content/public/browser/notification_service.h"
12 #include "content/public/browser/notification_types.h" 12 #include "content/public/browser/notification_types.h"
13 #include "content/public/test/test_utils.h" 13 #include "content/public/test/test_utils.h"
14 #include "extensions/browser/app_window/app_window_geometry_cache.h" 14 #include "extensions/browser/app_window/app_window_geometry_cache.h"
15 #include "extensions/common/constants.h" 15 #include "extensions/common/constants.h"
16 #include "extensions/common/extension.h" 16 #include "extensions/common/extension.h"
17 #include "extensions/test/extension_test_message_listener.h" 17 #include "extensions/test/extension_test_message_listener.h"
18 #include "extensions/test/result_catcher.h" 18 #include "extensions/test/result_catcher.h"
19 19
20 #if defined(OS_MACOSX)
21 #include "base/mac/mac_util.h"
22 #endif
23
20 using extensions::AppWindowGeometryCache; 24 using extensions::AppWindowGeometryCache;
21 using extensions::ResultCatcher; 25 using extensions::ResultCatcher;
22 26
23 // This helper class can be used to wait for changes in the app window 27 // This helper class can be used to wait for changes in the app window
24 // geometry cache registry for a specific window in a specific extension. 28 // geometry cache registry for a specific window in a specific extension.
25 class GeometryCacheChangeHelper : AppWindowGeometryCache::Observer { 29 class GeometryCacheChangeHelper : AppWindowGeometryCache::Observer {
26 public: 30 public:
27 GeometryCacheChangeHelper(AppWindowGeometryCache* cache, 31 GeometryCacheChangeHelper(AppWindowGeometryCache* cache,
28 const std::string& extension_id, 32 const std::string& extension_id,
29 const std::string& window_id, 33 const std::string& window_id,
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 } 151 }
148 152
149 // Flaky on Linux. http://crbug.com/424399. 153 // Flaky on Linux. http://crbug.com/424399.
150 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 154 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
151 #define MAYBE_TestMinimize DISABLED_TestMinimize 155 #define MAYBE_TestMinimize DISABLED_TestMinimize
152 #else 156 #else
153 #define MAYBE_TestMinimize TestMinimize 157 #define MAYBE_TestMinimize TestMinimize
154 #endif 158 #endif
155 159
156 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, MAYBE_TestMinimize) { 160 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, MAYBE_TestMinimize) {
161 #if defined(OS_MACOSX)
162 if (base::mac::IsOS10_10())
163 return; // Fails when swarmed. http://crbug.com/660582
164 #endif
157 ASSERT_TRUE(RunAppWindowAPITest("testMinimize")) << message_; 165 ASSERT_TRUE(RunAppWindowAPITest("testMinimize")) << message_;
158 } 166 }
159 167
160 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, DISABLED_TestRestore) { 168 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, DISABLED_TestRestore) {
161 ASSERT_TRUE(RunAppWindowAPITest("testRestore")) << message_; 169 ASSERT_TRUE(RunAppWindowAPITest("testRestore")) << message_;
162 } 170 }
163 171
164 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, DISABLED_TestRestoreAfterClose) { 172 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, DISABLED_TestRestoreAfterClose) {
165 ASSERT_TRUE(RunAppWindowAPITest("testRestoreAfterClose")) << message_; 173 ASSERT_TRUE(RunAppWindowAPITest("testRestoreAfterClose")) << message_;
166 } 174 }
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) { 266 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) {
259 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; 267 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_;
260 } 268 }
261 #endif 269 #endif
262 270
263 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestVisibleOnAllWorkspaces) { 271 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestVisibleOnAllWorkspaces) {
264 ASSERT_TRUE( 272 ASSERT_TRUE(
265 RunAppWindowAPITestAndWaitForRoundTrip("testVisibleOnAllWorkspaces")) 273 RunAppWindowAPITestAndWaitForRoundTrip("testVisibleOnAllWorkspaces"))
266 << message_; 274 << message_;
267 } 275 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/tabs/tabs_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698