CommandLine API rework

chrome/browser/net/chrome_url_request_context.cc

 // Copyright (c) 2006-2008 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/net/chrome_url_request_context.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "net/http/http_cache.h"
 #include "net/proxy/proxy_service.h"
 #include "webkit/glue/webkit_glue.h"
 
 // Sets up proxy info if it was specified, otherwise returns NULL. The
 // returned pointer MUST be deleted by the caller if non-NULL.
 static net::ProxyInfo* CreateProxyInfo() {
   net::ProxyInfo* proxy_info = NULL;
 
-  CommandLine command_line;
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kProxyServer)) {
     proxy_info = new net::ProxyInfo();
     const std::wstring& proxy_server =
         command_line.GetSwitchValue(switches::kProxyServer);
     proxy_info->UseNamedProxy(WideToASCII(proxy_server));
   }
 
   return proxy_info;
 }
 
 // static
 ChromeURLRequestContext* ChromeURLRequestContext::CreateOriginal(
     Profile* profile, const std::wstring& cookie_store_path,
     const std::wstring& disk_cache_path) {
   DCHECK(!profile->IsOffTheRecord());
   ChromeURLRequestContext* context = new ChromeURLRequestContext(profile);
 
   scoped_ptr<net::ProxyInfo> proxy_info(CreateProxyInfo());
   context->proxy_service_ = net::ProxyService::Create(proxy_info.get());
 
   net::HttpCache* cache =
       new net::HttpCache(context->proxy_service_, disk_cache_path, 0);
 
-  CommandLine command_line;
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   bool record_mode = chrome::kRecordModeEnabled &&
                      command_line.HasSwitch(switches::kRecordMode);
   bool playback_mode = command_line.HasSwitch(switches::kPlaybackMode);
 
   if (record_mode || playback_mode) {
     // Don't use existing cookies and use an in-memory store.
     context->cookie_store_ = new net::CookieMonster();
     cache->set_mode(
         record_mode ? net::HttpCache::RECORD : net::HttpCache::PLAYBACK);
   }
@@ skipping 144 matching lines @@
                                          NotificationService::NoDetails());
 
   delete cookie_store_;
   delete http_transaction_factory_;
 
   // Do not delete the proxy service in the case of OTR, as it is owned by the
   // original URLRequestContext.
   if (!is_off_the_record_)
     delete proxy_service_;
 }