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

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

Issue 586443002: mac: Disable AppShimInteractiveTest.Launch (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 207
208 runLoop_.reset(new base::RunLoop); 208 runLoop_.reset(new base::RunLoop);
209 runLoop_->Run(); 209 runLoop_->Run();
210 } 210 }
211 211
212 @end 212 @end
213 213
214 namespace apps { 214 namespace apps {
215 215
216 // Shims require static libraries http://crbug.com/386024. 216 // Shims require static libraries http://crbug.com/386024.
217 #if defined(COMPONENT_BUILD) 217 // This test is flaky on OSX. http://crbug.com/415422
218 #if defined(COMPONENT_BUILD) || defined(OS_MACOSX)
218 #define MAYBE_Launch DISABLED_Launch 219 #define MAYBE_Launch DISABLED_Launch
219 #define MAYBE_RebuildShim DISABLED_RebuildShim 220 #define MAYBE_RebuildShim DISABLED_RebuildShim
220 #else 221 #else
221 #define MAYBE_Launch Launch 222 #define MAYBE_Launch Launch
222 #define MAYBE_RebuildShim RebuildShim 223 #define MAYBE_RebuildShim RebuildShim
223 #endif 224 #endif
224 225
225 // Test that launching the shim for an app starts the app, and vice versa. 226 // Test that launching the shim for an app starts the app, and vice versa.
226 // These two cases are combined because the time to run the test is dominated 227 // These two cases are combined because the time to run the test is dominated
227 // by loading the extension and creating the shim. 228 // by loading the extension and creating the shim.
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 // the shim is rebuilt. 390 // the shim is rebuilt.
390 WindowedAppShimLaunchObserver(app->id()).Wait(); 391 WindowedAppShimLaunchObserver(app->id()).Wait();
391 392
392 EXPECT_TRUE(GetFirstAppWindow()); 393 EXPECT_TRUE(GetFirstAppWindow());
393 EXPECT_TRUE(HasAppShimHost(profile(), app->id())); 394 EXPECT_TRUE(HasAppShimHost(profile(), app->id()));
394 } 395 }
395 396
396 #endif // defined(ARCH_CPU_64_BITS) 397 #endif // defined(ARCH_CPU_64_BITS)
397 398
398 } // namespace apps 399 } // 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