Fix time outs in ephemeral apps tests

chrome/browser/apps/ephemeral_app_browsertest.cc

 // Copyright 2014 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.
 
 #include "apps/saved_files_service.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/stl_util.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/apps/ephemeral_app_service.h"
 #include "chrome/browser/extensions/api/file_system/file_system_api.h"
@@ skipping 110 matching lines @@
   }
 
   bool LaunchAppAndRunTest(const Extension* app, const char* test_name) {
     ExtensionTestMessageListener launched_listener("launched", true);
     LaunchPlatformApp(app);
     if (!launched_listener.WaitUntilSatisfied()) {
       message_ = "Failed to receive launched message from test";
       return false;
     }
 
+    ResultCatcher catcher;
     launched_listener.Reply(test_name);
 
-    ResultCatcher catcher;
-    if (!catcher.GetNextResult()) {
+    bool result = catcher.GetNextResult();
+    if (!result)

[tapted, 2014/05/14 01:54:58]

nit: this `if` probably isn't needed (i.e. do `message_ = catcher.message();`
unconditionally).

ExtensionApiTest::ResultCatcher::Observe(..) seems designed to support message()
returning an empty string on success. (theoretical benefit of this: you could
call LaunchAppAndRunTest multiple times and message_ would be correctly cleared
on success).

       message_ = catcher.message();
-      return false;
-    }
 
     CloseApp(app->id());
-    return true;
+    return result;
   }
 
   void CloseApp(const std::string& app_id) {
     content::WindowedNotificationObserver event_page_destroyed_signal(
         chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED,
         content::Source<Profile>(browser()->profile()));
 
     EXPECT_EQ(1U, GetAppWindowCountForApp(app_id));
     apps::AppWindow* app_window = GetFirstAppWindowForApp(app_id);
     ASSERT_TRUE(app_window);
@@ skipping 351 matching lines @@
 
   // The garbage collected app should no longer be in the preferences.
   extensions_info = prefs->GetEvictedEphemeralAppsInfo();
   EXPECT_TRUE(IsAppInExtensionsInfo(*extensions_info, retain_app_id));
   ASSERT_FALSE(IsAppInExtensionsInfo(*extensions_info, evict_app_id));
 
   // Reinstall the app and verify that all data has been reset.
   evict_app = InstallEphemeralApp(kRetainDataApp);
   ASSERT_TRUE(LaunchAppAndRunTest(evict_app, "DataReset")) << message_;
 }