Remove code path that passes a file handle to the renderer...

chrome/browser/profile.cc

 // Copyright (c) 2006-2008 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/profile.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 82 matching lines @@
 //
 // OffTheRecordProfileImpl is a profile subclass that wraps an existing profile
 // to make it suitable for the off the record mode.
 //
 ////////////////////////////////////////////////////////////////////////////////
 class OffTheRecordProfileImpl : public Profile,
                                 public NotificationObserver {
  public:
   explicit OffTheRecordProfileImpl(Profile* real_profile)
       : profile_(real_profile),
-        media_request_context_(NULL),
         extensions_request_context_(NULL),
         start_time_(Time::Now()) {
     request_context_ = ChromeURLRequestContext::CreateOffTheRecord(this);
     request_context_->AddRef();
 
     extension_process_manager_.reset(new ExtensionProcessManager(this));
 
     // Register for browser close notifications so we can detect when the last
     // off-the-record window is closed, in which case we can clean our states
     // (cookies, downloads...).
     registrar_.Add(this, NotificationType::BROWSER_CLOSED,
                    NotificationService::AllSources());
   }
 
   virtual ~OffTheRecordProfileImpl() {
     CleanupRequestContext(request_context_);
-    CleanupRequestContext(media_request_context_);
     CleanupRequestContext(extensions_request_context_);
   }
 
   virtual FilePath GetPath() { return profile_->GetPath(); }
 
   virtual bool IsOffTheRecord() {
     return true;
   }
 
   virtual Profile* GetOffTheRecordProfile() {
@@ skipping 99 matching lines @@
 
   virtual ThemeProvider* GetThemeProvider() {
     return GetOriginalProfile()->GetThemeProvider();
   }
 
   virtual URLRequestContext* GetRequestContext() {
     return request_context_;
   }
 
   virtual URLRequestContext* GetRequestContextForMedia() {
-    if (!media_request_context_) {
-      FilePath cache_path = GetPath();
-
-      // Override the cache location if specified by the user.
-      const std::wstring user_cache_dir(
-          CommandLine::ForCurrentProcess()->GetSwitchValue(
-              switches::kDiskCacheDir));
-      if (!user_cache_dir.empty()) {
-        cache_path = FilePath::FromWStringHack(user_cache_dir);
-      }
-
-      cache_path = cache_path.Append(chrome::kOffTheRecordMediaCacheDirname);
-      media_request_context_ =
-          ChromeURLRequestContext::CreateOffTheRecordForMedia(
-              this, cache_path);
-      media_request_context_->AddRef();
-
-      DCHECK(media_request_context_->cookie_store());
-    }
-    return media_request_context_;
+    // In OTR mode, media request context is the same as the original one.
+    return request_context_;
   }
 
   URLRequestContext* GetRequestContextForExtensions() {
     if (!extensions_request_context_) {
       extensions_request_context_ =
           ChromeURLRequestContext::CreateOffTheRecordForExtensions(this);
       extensions_request_context_->AddRef();
 
       DCHECK(extensions_request_context_->cookie_store());
     }
@@ skipping 100 matching lines @@
 
  private:
   NotificationRegistrar registrar_;
 
   // The real underlying profile.
   Profile* profile_;
 
   // The context to use for requests made from this OTR session.
   ChromeURLRequestContext* request_context_;
 
-  // The context for requests for media resources.
-  ChromeURLRequestContext* media_request_context_;
-
   ChromeURLRequestContext* extensions_request_context_;
 
   // The download manager that only stores downloaded items in memory.
   scoped_refptr<DownloadManager> download_manager_;
 
   // The download manager that only stores downloaded items in memory.
   scoped_refptr<BrowserThemeProvider> theme_provider_;
 
   // We don't want SSLHostState from the OTR profile to leak back to the main
   // profile because then the main profile would learn some of the host names
@@ skipping 618 matching lines @@
 
 void ProfileImpl::StopCreateSessionServiceTimer() {
   create_session_service_timer_.Stop();
 }
 
 #ifdef CHROME_PERSONALIZATION
 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() {
   return personalization_.get();
 }
 #endif