| Index: chrome/browser/extensions/app_process_apitest.cc
|
| diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
|
| index 33437b22a165a2348223253d93680718a1562a82..7f670458ccb2b0ed076b4e6a75a8fa15f68c332f 100644
|
| --- a/chrome/browser/extensions/app_process_apitest.cc
|
| +++ b/chrome/browser/extensions/app_process_apitest.cc
|
| @@ -387,8 +387,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_AppProcessRedirectBack) {
|
|
|
| // Ensure that reloading a URL after installing or uninstalling it as an app
|
| // correctly swaps the process. (http://crbug.com/80621)
|
| -// Disabled until we get a correct fix for 80621. See http://crbug.com/102408.
|
| -IN_PROC_BROWSER_TEST_F(AppApiTest, DISABLED_ReloadIntoAppProcess) {
|
| +IN_PROC_BROWSER_TEST_F(AppApiTest, ReloadIntoAppProcess) {
|
| CommandLine::ForCurrentProcess()->AppendSwitch(
|
| switches::kDisablePopupBlocking);
|
|
|
| @@ -467,7 +466,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, DISABLED_ReloadIntoAppProcess) {
|
| &browser()->GetSelectedTabContentsWrapper()->web_contents()->
|
| GetController()));
|
| ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(contents->GetRenderViewHost(),
|
| - L"", L"location.reload();"));
|
| + L"", L"location = location;"));
|
| js_reload_observer2.Wait();
|
| EXPECT_FALSE(process_map->Contains(
|
| contents->GetRenderProcessHost()->GetID()));
|
|
|