Revert of Simplify BrowserContext by removing redundant methods.

chrome/browser/browsing_data/browsing_data_remover.cc

 // Copyright (c) 2012 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/browsing_data/browsing_data_remover.h"
 
 #include <map>
 #include <set>
 #include <string>
 
@@ skipping 282 matching lines @@
           UserMetricsAction("ClearBrowsingData_Everything"));
       break;
   }
   return TimeRange(CalculateBeginDeleteTime(period), base::Time::Max());
 }
 
 BrowsingDataRemover::BrowsingDataRemover(
     content::BrowserContext* browser_context)
     : profile_(Profile::FromBrowserContext(browser_context)),
       is_removing_(false),
+      main_context_getter_(browser_context->GetRequestContext()),
+      media_context_getter_(browser_context->GetMediaRequestContext()),
 #if BUILDFLAG(ANDROID_JAVA_UI)
       webapp_registry_(new WebappRegistry()),
 #endif
       weak_ptr_factory_(this) {
   DCHECK(browser_context);
 }
 
 BrowsingDataRemover::~BrowsingDataRemover() {
   // If we are still removing data, notify observers so they can remove
   // themselves from the observer list.
@@ skipping 322 matching lines @@
   }
 
   // Channel IDs are not separated for protected and unprotected web
   // origins. We check the origin_type_mask_ to prevent unintended deletion.
   if (remove_mask & REMOVE_CHANNEL_IDS &&
       origin_type_mask_ & BrowsingDataHelper::UNPROTECTED_WEB) {
     content::RecordAction(
         UserMetricsAction("ClearBrowsingData_ChannelIDs"));
     // Since we are running on the UI thread don't call GetURLRequestContext().
     scoped_refptr<net::URLRequestContextGetter> rq_context =
-        content::BrowserContext::GetDefaultStoragePartition(profile_)->
-          GetURLRequestContext();
-    waiting_for_clear_channel_ids_ = true;
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        base::Bind(&ClearChannelIDsOnIOThread, delete_begin_, delete_end_,
-                    std::move(rq_context),
-                    base::Bind(&BrowsingDataRemover::OnClearedChannelIDs,
-                              weak_ptr_factory_.GetWeakPtr())));
+        profile_->GetRequestContext();
+    if (rq_context) {
+      waiting_for_clear_channel_ids_ = true;
+      BrowserThread::PostTask(
+          BrowserThread::IO, FROM_HERE,
+          base::Bind(&ClearChannelIDsOnIOThread, delete_begin_, delete_end_,
+                     std::move(rq_context),
+                     base::Bind(&BrowsingDataRemover::OnClearedChannelIDs,
+                                weak_ptr_factory_.GetWeakPtr())));
+    }
   }
 
   if (remove_mask & REMOVE_LOCAL_STORAGE) {
     storage_partition_remove_mask |=
         content::StoragePartition::REMOVE_DATA_MASK_LOCAL_STORAGE;
   }
 
   if (remove_mask & REMOVE_INDEXEDDB) {
     storage_partition_remove_mask |=
         content::StoragePartition::REMOVE_DATA_MASK_INDEXEDDB;
@@ skipping 581 matching lines @@
   waiting_for_clear_domain_reliability_monitor_ = false;
   NotifyIfDone();
 }
 
 // static
 BrowsingDataRemover::CallbackSubscription
     BrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback(
         const BrowsingDataRemover::Callback& callback) {
   return GetOnBrowsingDataRemovedCallbacks()->Add(callback);
 }