Don't hold the installed app in BrowserProcessRenderHost, since that's in content layer now. Ext...

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"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/browser/renderer_host/browser_render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "net/base/mock_host_resolver.h"
 
 namespace {
 
 class IsolatedAppApiTest : public ExtensionApiTest {
  public:
   // Returns whether the given tab's current URL has the given cookie.
   bool WARN_UNUSED_RESULT HasCookie(TabContents* contents, std::string cookie) {
     int value_size;
     std::string actual_cookie;
     automation_util::GetCookies(contents->GetURL(), contents, &value_size,
                                 &actual_cookie);
     return actual_cookie.find(cookie) != std::string::npos;
   }
 
   const Extension* GetInstalledApp(TabContents* contents) {
-    return static_cast<BrowserRenderProcessHost*>(
-        contents->render_view_host()->process())->installed_app();
+    const Extension* installed_app = NULL;
+    ExtensionService* service = contents->profile()->GetExtensionService();
+    if (service) {
+      installed_app = service->GetInstalledAppForRenderer(
+          contents->render_view_host()->process()->id());
+    }
+    return installed_app;
   }
 };
 
 }  // namespace
 
 // Tests that cookies set within an isolated app are not visible to normal
 // pages or other apps.
 IN_PROC_BROWSER_TEST_F(IsolatedAppApiTest, CookieIsolation) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kDisablePopupBlocking);
@@ skipping 88 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"));
 }