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

Side by Side Diff: apps/app_shim/app_shim_interactive_uitest_mac.mm

Issue 602483002: Disable AppShimInteractiveTest.Launch. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 #include <vector> 6 #include <vector>
7 7
8 #include "apps/app_shim/app_shim_handler_mac.h" 8 #include "apps/app_shim/app_shim_handler_mac.h"
9 #include "apps/app_shim/app_shim_host_manager_mac.h" 9 #include "apps/app_shim/app_shim_host_manager_mac.h"
10 #include "apps/app_shim/extension_app_shim_handler_mac.h" 10 #include "apps/app_shim/extension_app_shim_handler_mac.h"
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 219
220 @end 220 @end
221 221
222 namespace apps { 222 namespace apps {
223 223
224 // Shims require static libraries http://crbug.com/386024. 224 // Shims require static libraries http://crbug.com/386024.
225 #if defined(COMPONENT_BUILD) 225 #if defined(COMPONENT_BUILD)
226 #define MAYBE_Launch DISABLED_Launch 226 #define MAYBE_Launch DISABLED_Launch
227 #define MAYBE_RebuildShim DISABLED_RebuildShim 227 #define MAYBE_RebuildShim DISABLED_RebuildShim
228 #else 228 #else
229 #define MAYBE_Launch Launch 229 // Launch is flaky http://crbug.com/415422.
230 #define MAYBE_Launch DISABLED_Launch
230 #define MAYBE_RebuildShim RebuildShim 231 #define MAYBE_RebuildShim RebuildShim
231 #endif 232 #endif
232 233
233 // Test that launching the shim for an app starts the app, and vice versa. 234 // Test that launching the shim for an app starts the app, and vice versa.
234 // These two cases are combined because the time to run the test is dominated 235 // These two cases are combined because the time to run the test is dominated
235 // by loading the extension and creating the shim. 236 // by loading the extension and creating the shim.
236 IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_Launch) { 237 IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_Launch) {
237 // Install the app. 238 // Install the app.
238 const extensions::Extension* app = InstallPlatformApp("minimal"); 239 const extensions::Extension* app = InstallPlatformApp("minimal");
239 240
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 // the shim is rebuilt. 399 // the shim is rebuilt.
399 WindowedAppShimLaunchObserver(app->id()).Wait(); 400 WindowedAppShimLaunchObserver(app->id()).Wait();
400 401
401 EXPECT_TRUE(GetFirstAppWindow()); 402 EXPECT_TRUE(GetFirstAppWindow());
402 EXPECT_TRUE(HasAppShimHost(profile(), app->id())); 403 EXPECT_TRUE(HasAppShimHost(profile(), app->id()));
403 } 404 }
404 405
405 #endif // defined(ARCH_CPU_64_BITS) 406 #endif // defined(ARCH_CPU_64_BITS)
406 407
407 } // namespace apps 408 } // namespace apps
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698