Revert of Simplify BrowserContext by removing redundant methods.

content/browser/media/cdm/browser_cdm_manager.cc

 // Copyright 2014 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 "content/browser/media/cdm/browser_cdm_manager.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/task_runner.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/permission_manager.h"
 #include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_process_host_observer.h"
-#include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "media/base/cdm_config.h"
 #include "media/base/cdm_factory.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/limits.h"
 
 #if defined(OS_ANDROID)
 #include "content/public/browser/android/provision_fetcher_factory.h"
 #include "content/public/common/renderer_preferences.h"
 #include "media/base/android/android_cdm_factory.h"
@@ skipping 248 matching lines @@
 
 media::CdmFactory* BrowserCdmManager::GetCdmFactory() {
   if (!cdm_factory_) {
     // Create a new CdmFactory.
     cdm_factory_ = GetContentClient()->browser()->CreateCdmFactory();
 
 #if defined(OS_ANDROID)
     if (!cdm_factory_) {
       // Obtain http request context for the current render process.
       net::URLRequestContextGetter* context_getter =
-          BrowserContext::GetDefaultStoragePartition(
-              RenderProcessHost::FromID(render_process_id_)->
-                  GetBrowserContext())->GetURLRequestContext();
+          RenderProcessHost::FromID(render_process_id_)
+              ->GetBrowserContext()
+              ->GetRequestContext();
       DCHECK(context_getter);
 
       cdm_factory_.reset(new media::AndroidCdmFactory(
           base::Bind(&CreateProvisionFetcher, context_getter)));
     }
 #endif
   }
 
   return cdm_factory_.get();
 }
@@ skipping 422 matching lines @@
   scoped_refptr<MediaKeys> cdm = GetCdm(render_frame_id, cdm_id);
   if (!cdm) {
     promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "CDM not found.");
     return;
   }
 
   cdm->LoadSession(session_type, session_id, std::move(promise));
 }
 
 }  // namespace content