Tie extension/app initialization to RenderView creation, not RenderViewHost creation

chrome/browser/extensions/isolated_app_apitest.cc

Index: chrome/browser/extensions/isolated_app_apitest.cc
diff --git a/chrome/browser/extensions/isolated_app_apitest.cc b/chrome/browser/extensions/isolated_app_apitest.cc
index d7bcccf2e52c0df71f82beac4dc271303bcac61e..4ae84764330e094e0fd49f766e014825a2ccb65b 100644
--- a/chrome/browser/extensions/isolated_app_apitest.cc
+++ b/chrome/browser/extensions/isolated_app_apitest.cc
@@ -90,27 +90,36 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppApiTest, MAYBE_CookieIsolation) {
   ASSERT_TRUE(!GetInstalledApp(tab3));
 
   // Check that each tab sees its own cookie.
-  ASSERT_TRUE(HasCookie(tab1, "app1=3"));
-  ASSERT_TRUE(HasCookie(tab2, "app2=4"));
-  ASSERT_TRUE(HasCookie(tab3, "normalPage=5"));
+  EXPECT_TRUE(HasCookie(tab1, "app1=3"));
+  EXPECT_TRUE(HasCookie(tab2, "app2=4"));
+  EXPECT_TRUE(HasCookie(tab3, "normalPage=5"));
 
   // Check that app1 tab cannot see the other cookies.
-  ASSERT_FALSE(HasCookie(tab1, "app2"));
-  ASSERT_FALSE(HasCookie(tab1, "normalPage"));
+  EXPECT_FALSE(HasCookie(tab1, "app2"));
+  EXPECT_FALSE(HasCookie(tab1, "normalPage"));
 
   // Check that app2 tab cannot see the other cookies.
-  ASSERT_FALSE(HasCookie(tab2, "app1"));
-  ASSERT_FALSE(HasCookie(tab2, "normalPage"));
+  EXPECT_FALSE(HasCookie(tab2, "app1"));
+  EXPECT_FALSE(HasCookie(tab2, "normalPage"));
 
   // Check that normal tab cannot see the other cookies.
-  ASSERT_FALSE(HasCookie(tab3, "app1"));
-  ASSERT_FALSE(HasCookie(tab3, "app2"));
+  EXPECT_FALSE(HasCookie(tab3, "app1"));
+  EXPECT_FALSE(HasCookie(tab3, "app2"));
 
   // Check that the non_app iframe cookie is associated with app1 and not the
   // normal tab.  (For now, iframes are always rendered in their parent
   // process, even if they aren't in the app manifest.)
-  ASSERT_TRUE(HasCookie(tab1, "nonAppFrame=6"));
-  ASSERT_FALSE(HasCookie(tab3, "nonAppFrame"));
+  EXPECT_TRUE(HasCookie(tab1, "nonAppFrame=6"));
+  EXPECT_FALSE(HasCookie(tab3, "nonAppFrame"));
+
+  // Check that isolation persists even if the tab crashes and is reloaded.
+  browser()->SelectNumberedTab(1);
+  ui_test_utils::CrashTab(tab1);
+  browser()->Reload(CURRENT_TAB);
+  ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
+  EXPECT_TRUE(HasCookie(tab1, "app1=3"));
+  EXPECT_FALSE(HasCookie(tab1, "app2"));
+  EXPECT_FALSE(HasCookie(tab1, "normalPage"));
 }
 
 // Ensure that cookies are not isolated if the isolated apps are not installed.