Revert 61899 for breaking cookes on file:// URLs....

chrome/browser/automation/automation_resource_message_filter.cc

 // Copyright (c) 2010 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_resource_message_filter.h"
 
 #include "base/histogram.h"
 #include "base/path_service.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/automation/url_request_automation_job.h"
@@ skipping 208 matching lines @@
     bool pending_view) {
   if (!renderer_pid || !renderer_id || !tab_handle) {
     NOTREACHED();
     return false;
   }
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableFunction(
           AutomationResourceMessageFilter::RegisterRenderViewInIOThread,
-          renderer_pid,
-          renderer_id,
-          tab_handle,
-          make_scoped_refptr(filter),
-          pending_view));
+          renderer_pid, renderer_id, tab_handle, filter, pending_view));
   return true;
 }
 
 void AutomationResourceMessageFilter::UnRegisterRenderView(
     int renderer_pid, int renderer_id) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableFunction(
           AutomationResourceMessageFilter::UnRegisterRenderViewInIOThread,
           renderer_pid, renderer_id));
 }
 
 bool AutomationResourceMessageFilter::ResumePendingRenderView(
     int renderer_pid, int renderer_id, int tab_handle,
     AutomationResourceMessageFilter* filter) {
   if (!renderer_pid || !renderer_id || !tab_handle) {
     NOTREACHED();
     return false;
   }
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableFunction(
           AutomationResourceMessageFilter::ResumePendingRenderViewInIOThread,
-          renderer_pid,
-          renderer_id,
-          tab_handle,
-          make_scoped_refptr(filter)));
+          renderer_pid, renderer_id, tab_handle, filter));
   return true;
 }
 
 void AutomationResourceMessageFilter::RegisterRenderViewInIOThread(
     int renderer_pid, int renderer_id,
     int tab_handle, AutomationResourceMessageFilter* filter,
     bool pending_view) {
   RendererId renderer_key(renderer_pid, renderer_id);
 
   scoped_refptr<net::CookieStore> cookie_store =
@@ skipping 252 matching lines @@
           index != old_filter->pending_request_map_.end(); index++) {
     scoped_refptr<URLRequestAutomationJob> job = (*index).second;
     DCHECK_EQ(job->message_filter(), old_filter);
     DCHECK(job->is_pending());
     // StartPendingJob will register the job with the new filter.
     job->StartPendingJob(tab_handle, new_filter);
   }
 
   old_filter->pending_request_map_.clear();
 }