Options: Rename options2 namespace to options.

chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc

 // 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.
 
 #include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
@@ skipping 58 matching lines @@
 
   SendResponse(request_id, base::RefCountedString::TakeString(&full_html));
 }
 
 }  // namespace
 
 namespace chromeos {
 
 ProxySettingsUI::ProxySettingsUI(content::WebUI* web_ui)
     : WebUIController(web_ui),
-      proxy_handler_(new options2::ProxyHandler()),
-      core_handler_(new options2::CoreChromeOSOptionsHandler()) {
+      proxy_handler_(new options::ProxyHandler()),
+      core_handler_(new options::CoreChromeOSOptionsHandler()) {
   // |localized_strings| will be owned by ProxySettingsHTMLSource.
   DictionaryValue* localized_strings = new DictionaryValue();
 
   core_handler_->set_handlers_host(this);
   core_handler_->GetLocalizedValues(localized_strings);
   web_ui->AddMessageHandler(core_handler_);
 
   proxy_handler_->GetLocalizedValues(localized_strings);
   web_ui->AddMessageHandler(proxy_handler_);
 
@@ skipping 16 matching lines @@
   core_handler_->InitializePage();
   proxy_handler_->InitializePage();
   Profile* profile = Profile::FromWebUI(web_ui());
   PrefProxyConfigTracker* proxy_tracker = profile->GetProxyConfigTracker();
   proxy_tracker->UIMakeActiveNetworkCurrent();
   std::string network_name;
   proxy_tracker->UIGetCurrentNetworkName(&network_name);
 }
 
 }  // namespace chromeos