| Index: chrome/browser/apps/app_browsertest.cc
|
| diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc
|
| index a5a75823538c2a0780df22b8cb7a5bebc28f9657..4dfedf004be80f0e24ca9dfc8e31bf03697b54b0 100644
|
| --- a/chrome/browser/apps/app_browsertest.cc
|
| +++ b/chrome/browser/apps/app_browsertest.cc
|
| @@ -1041,16 +1041,9 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, ComponentAppBackgroundPage) {
|
| ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
|
| }
|
|
|
| -// Fails on Win7. http://crbug.com/171450
|
| -#if defined(OS_WIN)
|
| -#define MAYBE_Messaging DISABLED_Messaging
|
| -#else
|
| -#define MAYBE_Messaging Messaging
|
| -#endif
|
| -
|
| -IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_Messaging) {
|
| +IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, Messaging) {
|
| ExtensionApiTest::ResultCatcher result_catcher;
|
| - LoadAndLaunchPlatformApp("messaging/app2", "Launched");
|
| + LoadAndLaunchPlatformApp("messaging/app2", "Ready");
|
| LoadAndLaunchPlatformApp("messaging/app1", "Launched");
|
| EXPECT_TRUE(result_catcher.GetNextResult());
|
| }
|
|
|