Simplify BrowserContext by removing redundant methods.

chrome/browser/chromeos/login/session/user_session_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 "chrome/browser/chromeos/login/session/user_session_manager.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <string>
@@ skipping 1344 matching lines @@
   // signing in with GAIA webview (i.e. webview instance hasn't been
   // initialized at all). Use fallback request context if authenticator was
   // provided.
   // Authenticator instance may not be initialized for session
   // restore case when Chrome is restarting after crash or to apply custom user
   // flags. In that case auth_request_context will be nullptr which is accepted
   // by RestoreSession() for session restore case.
   if (!auth_request_context &&
       (authenticator_.get() && authenticator_->authentication_context())) {
     auth_request_context =
-        authenticator_->authentication_context()->GetRequestContext();
+        content::BrowserContext::GetDefaultStoragePartition(
+            authenticator_->authentication_context())->GetURLRequestContext();
   }
   login_manager->RestoreSession(auth_request_context, session_restore_strategy_,
                                 user_context_.GetRefreshToken(),
                                 user_context_.GetAccessToken());
 }
 
 void UserSessionManager::InitRlzImpl(Profile* profile, bool disabled) {
 #if defined(ENABLE_RLZ)
   PrefService* local_state = g_browser_process->local_state();
   if (disabled) {
@@ skipping 189 matching lines @@
 
   if (StartupUtils::IsWebviewSigninEnabled()) {
     // Webview uses different partition storage than iframe. We need to get
     // cookies from the right storage for url request to get auth token into
     // session.
     content::StoragePartition* signin_partition = login::GetSigninPartition();
     if (signin_partition)
       auth_request_context = signin_partition->GetURLRequestContext();
   } else if (authenticator_.get() && authenticator_->authentication_context()) {
     auth_request_context =
-        authenticator_->authentication_context()->GetRequestContext();
+        content::BrowserContext::GetDefaultStoragePartition(
+            authenticator_->authentication_context())->GetURLRequestContext();
   }
   return auth_request_context;
 }
 
 void UserSessionManager::AttemptRestart(Profile* profile) {
   // Restart unconditionally in case if we are stuck somewhere in a session
   // restore process. http://crbug.com/520346.
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE, base::Bind(RestartOnTimeout),
       base::TimeDelta::FromSeconds(kMaxRestartDelaySeconds));
@@ skipping 236 matching lines @@
   token_handle_util_.reset();
   first_run::GoodiesDisplayer::Delete();
 }
 
 void UserSessionManager::CreateTokenUtilIfMissing() {
   if (!token_handle_util_.get())
     token_handle_util_.reset(new TokenHandleUtil());
 }
 
 }  // namespace chromeos