CommandLine API rework

chrome/browser/search_engines/template_url_prepopulate_data.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/search_engines/template_url_prepopulate_data.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ skipping 2662 matching lines @@
   }
   const GetUserGeoIDFunction GetUserGeoIDPtr =
       reinterpret_cast<GetUserGeoIDFunction>(GetProcAddress(kernel32_handle,
                                                             "GetUserGeoID"));
   return GetUserGeoIDPtr ?
       ((*GetUserGeoIDPtr)(GEOCLASS_NATION)) : GEOID_NOT_AVAILABLE;
 }
 
 int GetGeoIDFromPrefs(PrefService* prefs) {
   // See if the user overrode the GeoID on the command line.
-  CommandLine parsed_command_line;
   const std::wstring geoID(
-      parsed_command_line.GetSwitchValue(switches::kGeoID));
+    CommandLine::ForCurrentProcess()->GetSwitchValue(switches::kGeoID));
   if (!geoID.empty())
     return _wtoi(geoID.c_str());
 
   // Cache first run GeoID value in prefs, and use it afterwards.  This ensures
   // that just because the user moves around, we won't automatically make major
   // changes to their available search providers, which would feel surprising.
   if (!prefs)
     return GetCurrentGeoID();
   if (!prefs->HasPrefPath(prefs::kGeoIDAtInstall))
     prefs->SetInteger(prefs::kGeoIDAtInstall, GetCurrentGeoID());
@@ skipping 377 matching lines @@
     new_turl->set_date_created(Time());
     std::vector<std::string> turl_encodings;
     turl_encodings.push_back(engines[i]->encoding);
     new_turl->set_input_encodings(turl_encodings);
     new_turl->set_prepopulate_id(engines[i]->id);
     t_urls->push_back(new_turl);
   }
 }
 
 }  // namespace TemplateURLPrepopulateData