"Redirecting URLs to Packaged Apps" implementation: revised

chrome/browser/apps/app_browsertest_util.cc

Index: chrome/browser/apps/app_browsertest_util.cc
diff --git a/chrome/browser/apps/app_browsertest_util.cc b/chrome/browser/apps/app_browsertest_util.cc
index 7a2f9cee53d19d0c71688637bd2b3c2732dbac7f..996eba73bb52d223e57ff455dbbc38c57a8cc6f5 100644
--- a/chrome/browser/apps/app_browsertest_util.cc
+++ b/chrome/browser/apps/app_browsertest_util.cc
@@ -9,6 +9,7 @@
 #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"
@@ -22,6 +23,7 @@
 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;
 
@@ -60,15 +62,22 @@ const Extension* PlatformAppBrowserTest::LoadAndLaunchPlatformApp(
   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,