Re-enable a load-and-launch browser test for win & linux

apps/load_and_launch_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Tests for the --load-and-launch-app switch.
 // The two cases are when chrome is running and another process uses the switch
 // and when chrome is started from scratch.
 
 #include "apps/switches.h"
 #include "base/process/launch.h"
@@ skipping 153 matching lines @@
 
     // Skip showing the error message box to avoid freezing the main thread.
     chrome::internal::g_should_skip_message_box_for_test = true;
   }
 
   DISALLOW_COPY_AND_ASSIGN(LoadAndLaunchExtensionBrowserTest);
 };
 
 }  // namespace
 
-
-// TODO(jackhou): Make this test not flaky on Vista or Linux Aura. See
-// http://crbug.com/176897

[msw, 2016/10/03 21:16:52]

nit: mention BUG=176897 (and close that bug if this sticks).

[proberge, 2016/10/04 13:31:54]

Done.

-#if defined(OS_WIN) || (defined(OS_LINUX) && defined(USE_AURA))
-#define MAYBE_LoadAndLaunchAppChromeNotRunning \
-        DISABLED_LoadAndLaunchAppChromeNotRunning
-#else
-#define MAYBE_LoadAndLaunchAppChromeNotRunning \
-        LoadAndLaunchAppChromeNotRunning
-#endif
-
 // Case where Chrome is not running.
 IN_PROC_BROWSER_TEST_F(LoadAndLaunchPlatformAppBrowserTest,
-                       MAYBE_LoadAndLaunchAppChromeNotRunning) {
+                       LoadAndLaunchAppChromeNotRunning) {
   LoadAndLaunchApp();
 }
 
 IN_PROC_BROWSER_TEST_F(LoadAndLaunchExtensionBrowserTest,
                        LoadAndLaunchExtension) {
   const std::vector<base::string16>* errors =
       ExtensionErrorReporter::GetInstance()->GetErrors();
 
 #if defined(GOOGLE_CHROME_BUILD)
   // The error is skipped on official builds.
   EXPECT_TRUE(errors->empty());
 #else
   // Expect |extension_instead_of_app_error|.
   EXPECT_EQ(1u, errors->size());
   EXPECT_NE(base::string16::npos,
             errors->at(0).find(base::ASCIIToUTF16(
                 "App loading flags cannot be used to load extensions")));
 #endif
 
   extensions::ExtensionRegistry* registry =
       extensions::ExtensionRegistry::Get(profile());
   EXPECT_EQ(nullptr,
             registry->GetExtensionById(
                 kTestExtensionId, extensions::ExtensionRegistry::EVERYTHING));
 }
 
 }  // namespace apps