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

chrome/browser/extensions/isolated_app_apitest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 72 matching lines @@
 
   // Ensure first two tabs have installed apps.
   TabContents* tab1 = browser()->GetTabContentsAt(1);
   TabContents* tab2 = browser()->GetTabContentsAt(2);
   TabContents* tab3 = browser()->GetTabContentsAt(3);
   ASSERT_TRUE(GetInstalledApp(tab1));
   ASSERT_TRUE(GetInstalledApp(tab2));
   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.
 #if defined(OS_WIN)
 // Disabled due to http://crbug.com/89090.
 #define MAYBE_NoCookieIsolationWithoutApp DISABLED_NoCookieIsolationWithoutApp
 #else
 #define MAYBE_NoCookieIsolationWithoutApp NoCookieIsolationWithoutApp
 #endif
 IN_PROC_BROWSER_TEST_F(IsolatedAppApiTest, NoCookieIsolationWithoutApp) {
@@ skipping 24 matching lines @@
   ASSERT_TRUE(HasCookie(browser()->GetTabContentsAt(1), "app2=4"));
   ASSERT_TRUE(HasCookie(browser()->GetTabContentsAt(1), "normalPage=5"));
   ASSERT_TRUE(HasCookie(browser()->GetTabContentsAt(1), "nonAppFrame=6"));
   ASSERT_TRUE(HasCookie(browser()->GetTabContentsAt(2), "app1=3"));
   ASSERT_TRUE(HasCookie(browser()->GetTabContentsAt(2), "normalPage=5"));
   ASSERT_TRUE(HasCookie(browser()->GetTabContentsAt(2), "nonAppFrame=6"));
   ASSERT_TRUE(HasCookie(browser()->GetTabContentsAt(3), "app1=3"));
   ASSERT_TRUE(HasCookie(browser()->GetTabContentsAt(3), "app2=4"));
   ASSERT_TRUE(HasCookie(browser()->GetTabContentsAt(3), "nonAppFrame=6"));
 }