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 39ff6dd69d692234f2ea17870f32f8188c83cc45..cac6144c57576344fdfcc05d1d7d9b02559e970e 100644 |
--- a/chrome/browser/extensions/app_process_apitest.cc |
+++ b/chrome/browser/extensions/app_process_apitest.cc |
@@ -388,8 +388,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); |
@@ -447,6 +446,9 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, DISABLED_ReloadIntoAppProcess) { |
EXPECT_FALSE(process_map->Contains( |
contents->GetRenderProcessHost()->GetID())); |
+ /* |
+ * Disable JavaScript reload testing, as it is currently not fixed. |
+ * |
Charlie Reis
2012/01/26 01:20:23
We don't use multi-line /* */ comments much.
You
nasko
2012/01/26 20:25:57
I've added the check and works to detect regular w
|
// Enable app and reload via JavaScript. |
EnableExtension(app->id()); |
ui_test_utils::WindowedNotificationObserver js_reload_observer( |
@@ -472,6 +474,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, DISABLED_ReloadIntoAppProcess) { |
js_reload_observer2.Wait(); |
EXPECT_FALSE(process_map->Contains( |
contents->GetRenderProcessHost()->GetID())); |
+ */ |
} |
// Tests that if we have a non-app process (path3/container.html) that has an |