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

chrome/browser/automation/automation_util.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 "chrome/browser/automation/automation_util.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/automation/automation_provider_json.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/renderer_host/browser_render_process_host.h"
+#include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/cookie_store.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace {
 
 void GetCookiesOnIOThread(
@@ skipping 68 matching lines @@
 
 TabContents* GetTabContentsAt(int browser_index, int tab_index) {
   if (tab_index < 0)
     return NULL;
   Browser* browser = GetBrowserAt(browser_index);
   if (!browser || tab_index >= browser->tab_count())
     return NULL;
   return browser->GetTabContentsAt(tab_index);
 }
 
+net::URLRequestContextGetter* GetRequestContext(TabContents* contents) {
+  // Since we may be on the UI thread don't call GetURLRequestContext().
+  // Get the request context specific to the current TabContents and app.
+  return contents->profile()->GetRequestContextForRenderProcess(
+      contents->render_view_host()->process()->id());
+}
+
 void GetCookies(const GURL& url,
                 TabContents* contents,
                 int* value_size,
                 std::string* value) {
   *value_size = -1;
   if (url.is_valid() && contents) {
-    // Since we may be on the UI thread don't call GetURLRequestContext().
-    // Get the request context specific to the current TabContents and app.
-    const Extension* installed_app = static_cast<BrowserRenderProcessHost*>(
-        contents->render_view_host()->process())->installed_app();
     scoped_refptr<net::URLRequestContextGetter> context_getter =
-        contents->profile()->GetRequestContextForPossibleApp(installed_app);
-
+        GetRequestContext(contents);
     base::WaitableEvent event(true /* manual reset */,
                               false /* not initially signaled */);
     CHECK(BrowserThread::PostTask(
               BrowserThread::IO, FROM_HERE,
               NewRunnableFunction(&GetCookiesOnIOThread,
                                   url, context_getter, &event, value)));
     event.Wait();
 
     *value_size = static_cast<int>(value->size());
   }
 }
 
 void SetCookie(const GURL& url,
                const std::string& value,
                TabContents* contents,
                int* response_value) {
   *response_value = -1;
 
   if (url.is_valid() && contents) {
-    // Since we may be on the UI thread don't call GetURLRequestContext().
-    // Get the request context specific to the current TabContents and app.
-    const Extension* installed_app = static_cast<BrowserRenderProcessHost*>(
-        contents->render_view_host()->process())->installed_app();
     scoped_refptr<net::URLRequestContextGetter> context_getter =
-        contents->profile()->GetRequestContextForPossibleApp(installed_app);
-
+        GetRequestContext(contents);
     base::WaitableEvent event(true /* manual reset */,
                               false /* not initially signaled */);
     bool success = false;
     CHECK(BrowserThread::PostTask(
               BrowserThread::IO, FROM_HERE,
               NewRunnableFunction(&SetCookieOnIOThread,
                                   url, value, context_getter, &event,
                                   &success)));
     event.Wait();
     if (success)
       *response_value = 1;
   }
 }
 
 void DeleteCookie(const GURL& url,
                   const std::string& cookie_name,
                   TabContents* contents,
                   bool* success) {
   *success = false;
   if (url.is_valid() && contents) {
-    // Since we may be on the UI thread don't call GetURLRequestContext().
-    // Get the request context specific to the current TabContents and app.
-    const Extension* installed_app = static_cast<BrowserRenderProcessHost*>(
-        contents->render_view_host()->process())->installed_app();
     scoped_refptr<net::URLRequestContextGetter> context_getter =
-        contents->profile()->GetRequestContextForPossibleApp(installed_app);
-
+        GetRequestContext(contents);
     base::WaitableEvent event(true /* manual reset */,
                               false /* not initially signaled */);
     CHECK(BrowserThread::PostTask(
               BrowserThread::IO, FROM_HERE,
               NewRunnableFunction(&DeleteCookieOnIOThread,
                                   url, cookie_name, context_getter, &event)));
     event.Wait();
     *success = true;
   }
 }
@@ skipping 158 matching lines @@
   event.Wait();
 
   if (!success) {
     reply.SendError("Could not set the cookie");
     return;
   }
   reply.SendSuccess(NULL);
 }
 
 }  // namespace automation_util