Removing last usage of default request context. Fixing up login_utils to not need it by allowing ac…

chrome/browser/profiles/profile.h

 // 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.
 
 // This class gathers state related to a single user profile.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_H_
 #pragma once
 
@@ skipping 129 matching lines @@
   static Profile* CreateProfile(const FilePath& path,
                                 Delegate* delegate,
                                 CreateMode create_mode);
 
   // Returns the profile corresponding to the given browser context.
   static Profile* FromBrowserContext(content::BrowserContext* browser_context);
 
   // Returns the profile corresponding to the given WebUI.
   static Profile* FromWebUI(content::WebUI* web_ui);
 
-  // TODO(rlp): Please do not use this function. It is a temporary fix
-  // for M19 stable. See crbug.com/125292.
-  static net::URLRequestContextGetter* GetDefaultRequestContextDeprecated() {
-    return Profile::GetDefaultRequestContext();
-  }
-
   // content::BrowserContext implementation ------------------------------------
 
   // Typesafe upcast.
   virtual TestingProfile* AsTestingProfile();
 
   // Returns the name associated with this profile. This name is displayed in
   // the browser frame.
   virtual std::string GetProfileName() = 0;
 
   // Return the incognito version of this profile. The returned pointer
@@ skipping 93 matching lines @@
 
   // Retrieves a pointer to the PrefService that manages the preferences
   // for this user profile.
   virtual PrefService* GetPrefs() = 0;
 
   // Retrieves a pointer to the PrefService that manages the preferences
   // for OffTheRecord Profiles.  This PrefService is lazily created the first
   // time that this method is called.
   virtual PrefService* GetOffTheRecordPrefs() = 0;
 
+  // Returns the main request context.
+  virtual net::URLRequestContextGetter* GetRequestContext() = 0;
+
   // Returns the request context used for extension-related requests.  This
   // is only used for a separate cookie store currently.
   virtual net::URLRequestContextGetter* GetRequestContextForExtensions() = 0;
 
   // Returns the request context used within an installed app that has
   // requested isolated storage.
   virtual net::URLRequestContextGetter* GetRequestContextForIsolatedApp(
       const std::string& app_id) = 0;
 
   // Returns the SSLConfigService for this profile.
@@ skipping 125 matching lines @@
   friend class ChromeURLDataManagerFactory;
   friend class OffTheRecordProfileImpl;
 
   // Returns a callback to a method returning a |ChromeURLDataManagerBackend|.
   // Used to create a |ChromeURLDataManager| for this |Profile|.
   // TODO(erg, willchan): Remove this once |ProfileIOData| is made into a
   //     |ProfileKeyedService|.
   virtual base::Callback<ChromeURLDataManagerBackend*(void)>
       GetChromeURLDataManagerBackendGetter() const = 0;
 
-  static net::URLRequestContextGetter* default_request_context_;
-
  private:
-  // ***DEPRECATED**: You should be passing in the specific profile's
-  // URLRequestContextGetter or using the system URLRequestContextGetter.
-  //
-  // Returns the request context for the "default" profile.  This may be called
-  // from any thread.  This CAN return NULL if a first request context has not
-  // yet been created.  If necessary, listen on the UI thread for
-  // NOTIFY_DEFAULT_REQUEST_CONTEXT_AVAILABLE.
-  static net::URLRequestContextGetter* GetDefaultRequestContext();
-
   bool restored_last_session_;
 
   // Accessibility events will only be propagated when the pause
   // level is zero.  PauseAccessibilityEvents and ResumeAccessibilityEvents
   // increment and decrement the level, respectively, rather than set it to
   // true or false, so that calls can be nested.
   int accessibility_pause_level_;
 };
 
 #if defined(COMPILER_GCC)
 namespace BASE_HASH_NAMESPACE {
 
 template<>
 struct hash<Profile*> {
   std::size_t operator()(Profile* const& p) const {
     return reinterpret_cast<std::size_t>(p);
   }
 };
 
 }  // namespace BASE_HASH_NAMESPACE
 #endif
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_H_