Extract ResultCatcher from ExtensionApiTest. Use it in ShellApiTest.

extensions/shell/browser/shell_browsertest.cc

Index: extensions/shell/browser/shell_browsertest.cc
diff --git a/extensions/shell/browser/shell_browsertest.cc b/extensions/shell/browser/shell_browsertest.cc
index 271ff080923e0660a3c0f8f0aa7438005872085d..7d4343ebfff58387ae4d8b03483d5458002df4af 100644
--- a/extensions/shell/browser/shell_browsertest.cc
+++ b/extensions/shell/browser/shell_browsertest.cc
@@ -2,30 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/files/file_path.h"
 #include "base/logging.h"
-#include "base/path_service.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/notification_types.h"
-#include "extensions/common/extension_paths.h"
-#include "extensions/shell/test/shell_test.h"
+#include "extensions/shell/test/shell_apitest.h"
 
 namespace extensions {
 
 // Test that we can open an app window and wait for it to load.
-IN_PROC_BROWSER_TEST_F(AppShellTest, Basic) {
-  base::FilePath test_data_dir;
-
-  content::WindowedNotificationObserver test_pass_observer(
-      extensions::NOTIFICATION_EXTENSION_TEST_PASSED,
-      content::NotificationService::AllSources());
-
-  PathService::Get(extensions::DIR_TEST_DATA, &test_data_dir);
-  test_data_dir = test_data_dir.AppendASCII("platform_app");
-  LoadAndLaunchApp(test_data_dir);
-
-  test_pass_observer.Wait();
+IN_PROC_BROWSER_TEST_F(ShellApiTest, Basic) {
+  ASSERT_TRUE(RunAppTest("platform_app")) << message_;
 }
 
 }  // namespace extensions