| Index: chrome/browser/extensions/platform_app_browsertest_util.cc
|
| diff --git a/chrome/browser/extensions/platform_app_browsertest_util.cc b/chrome/browser/extensions/platform_app_browsertest_util.cc
|
| index 5b26f9bb58c9f3b0dc82ad4b43a5328372ba576f..281fae18f34ffae71271b8e82202fec717c7b7ab 100644
|
| --- a/chrome/browser/extensions/platform_app_browsertest_util.cc
|
| +++ b/chrome/browser/extensions/platform_app_browsertest_util.cc
|
| @@ -32,17 +32,19 @@ void PlatformAppBrowserTest::SetUpCommandLine(CommandLine* command_line) {
|
| }
|
|
|
| const Extension* PlatformAppBrowserTest::LoadAndLaunchPlatformApp(
|
| - const char* name) {
|
| + Browser* browser, NotificationObserver* observer,
|
| + FilePath test_data_dir, const char* name) {
|
| content::WindowedNotificationObserver app_loaded_observer(
|
| content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
|
| content::NotificationService::AllSources());
|
|
|
| const Extension* extension = LoadExtension(
|
| - test_data_dir_.AppendASCII("platform_apps").AppendASCII(name));
|
| + browser, observer,
|
| + test_data_dir.AppendASCII("platform_apps").AppendASCII(name));
|
| EXPECT_TRUE(extension);
|
|
|
| application_launch::OpenApplication(application_launch::LaunchParams(
|
| - browser()->profile(), extension, extension_misc::LAUNCH_NONE,
|
| + browser->profile(), extension, extension_misc::LAUNCH_NONE,
|
| NEW_WINDOW));
|
|
|
| app_loaded_observer.Wait();
|
|
|