Deprecate Profile::GetDefaultRequestContext().

chrome/browser/chromeos/login/login_utils.cc

 // Copyright (c) 2011 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/login_utils.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 60 matching lines @@
 
 // Increase logging level for Guest mode to avoid LOG(INFO) messages in logs.
 const char kGuestModeLoggingLevel[] = "1";
 
 // Format of command line switch.
 const char kSwitchFormatString[] = " --%s=\"%s\"";
 
 // User name which is used in the Guest session.
 const char kGuestUserName[] = "";
 
+}  // namespace
+
 // Resets the proxy configuration service for the default request context.
 class ResetDefaultProxyConfigServiceTask : public Task {

[Nikita (slow), 2011/07/20 13:55:17]

Why move ResetDefaultProxyConfigServiceTask out of namespace?

[willchan no longer on Chromium, 2011/07/20 13:59:07]

Since I locked it down with a friend declaration whitelist, everything that uses
it must be publicly visible.

  public:
   ResetDefaultProxyConfigServiceTask(
       net::ProxyConfigService* proxy_config_service)
       : proxy_config_service_(proxy_config_service) {}
   virtual ~ResetDefaultProxyConfigServiceTask() {}
 
   // Task override.
   virtual void Run() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-    net::URLRequestContextGetter* getter = Profile::GetDefaultRequestContext();
+    // TODO(willchan): Move this class back into the anonymous namespace after
+    // we stop using this deprecated API.
+    net::URLRequestContextGetter* getter =
+        Profile::Deprecated::GetDefaultRequestContext();
     DCHECK(getter);
     if (getter) {
       getter->GetURLRequestContext()->proxy_service()->ResetConfigService(
           proxy_config_service_.release());
     }
   }
 
  private:
   scoped_ptr<net::ProxyConfigService> proxy_config_service_;
 
   DISALLOW_COPY_AND_ASSIGN(ResetDefaultProxyConfigServiceTask);
 };
 
-}  // namespace
-
 class LoginUtilsImpl : public LoginUtils,
                        public ProfileManagerObserver {
  public:
   LoginUtilsImpl()
       : background_view_(NULL) {
   }
 
   virtual void PrepareProfile(
       const std::string& username,
       const std::string& password,
@@ skipping 496 matching lines @@
   // Mark login host for deletion after browser starts.  This
   // guarantees that the message loop will be referenced by the
   // browser before it is dereferenced by the login host.
   if (login_host) {
     login_host->OnSessionStart();
     login_host = NULL;
   }
 }
 
 }  // namespace chromeos