| Index: trunk/src/chrome/browser/apps/app_browsertest_util.cc
|
| ===================================================================
|
| --- trunk/src/chrome/browser/apps/app_browsertest_util.cc (revision 222256)
|
| +++ trunk/src/chrome/browser/apps/app_browsertest_util.cc (working copy)
|
| @@ -60,22 +60,15 @@
|
| 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 = InstallPlatformApp(name);
|
| + const Extension* extension = InstallExtension(
|
| + test_data_dir_.AppendASCII("platform_apps").AppendASCII(name), 1);
|
| + EXPECT_TRUE(extension);
|
|
|
| chrome::OpenApplication(chrome::AppLaunchParams(browser()->profile(),
|
| extension,
|
|
|