"Redirecting URLs to Packaged Apps" implementation: revised

chrome/browser/apps/app_browsertest_util.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.
 
 #include "chrome/browser/apps/app_browsertest_util.h"
 
 #include "apps/app_window_contents.h"
 #include "apps/native_app_window.h"
 #include "apps/shell_window_registry.h"
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
+#include "base/strings/utf_string_conversions.h"

[not at google - send to devlin, 2013/09/09 21:01:05]

not used

[sergeygs, 2013/09/09 21:53:50]

Done.

 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/ui/apps/chrome_shell_window_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/common/switches.h"
 
 using apps::ShellWindow;
 using apps::ShellWindowRegistry;
 using content::WebContents;
+using base::ASCIIToUTF16;

[not at google - send to devlin, 2013/09/09 21:01:05]

not used

[sergeygs, 2013/09/09 21:53:50]

Done.

 
 namespace utils = extension_function_test_utils;
 
 namespace extensions {
 
 PlatformAppBrowserTest::PlatformAppBrowserTest() {
   ChromeShellWindowDelegate::DisableExternalOpenForTesting();
 }
 
 void PlatformAppBrowserTest::SetUpCommandLine(CommandLine* command_line) {
@@ skipping 18 matching lines @@
   chrome::OpenApplication(chrome::AppLaunchParams(browser()->profile(),
                                                   extension,
                                                   extension_misc::LAUNCH_NONE,
                                                   NEW_WINDOW));
 
   app_loaded_observer.Wait();
 
   return extension;
 }
 
+const Extension* PlatformAppBrowserTest::InstallPlatformApp(
+    const char* name) {
+  const Extension* extension = InstallExtension(
+      test_data_dir_.AppendASCII("platform_apps").AppendASCII(name), 1);
+  EXPECT_TRUE(extension);
+
+  return extension;
+}
+
 const Extension* PlatformAppBrowserTest::InstallAndLaunchPlatformApp(
     const char* name) {
   content::WindowedNotificationObserver app_loaded_observer(
       content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
       content::NotificationService::AllSources());
 
-  const Extension* extension = InstallExtension(
-      test_data_dir_.AppendASCII("platform_apps").AppendASCII(name), 1);
-  EXPECT_TRUE(extension);
+  const Extension* extension = InstallPlatformApp(name);
 
   chrome::OpenApplication(chrome::AppLaunchParams(browser()->profile(),
                                                   extension,
                                                   extension_misc::LAUNCH_NONE,
                                                   NEW_WINDOW));
 
   app_loaded_observer.Wait();
 
   return extension;
 }
@@ skipping 103 matching lines @@
                                           bounds);
 }
 
 void ExperimentalPlatformAppBrowserTest::SetUpCommandLine(
     CommandLine* command_line) {
   PlatformAppBrowserTest::SetUpCommandLine(command_line);
   command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
 }
 
 }  // namespace extensions