Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/chromeos/internet_options_handler.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/options2/chromeos/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 457 matching lines @@
       name_servers_key, &name_servers)) {
     ip_info_dict->SetString(kIpConfigNameServers, name_servers);
     VLOG(2) << "Found " << name_servers_key << ": " << name_servers;
   }
 
   return ip_info_dict.release();
 }
 
 }  // namespace
 
-namespace options2 {
+namespace options {
 
 InternetOptionsHandler::InternetOptionsHandler()
   : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   registrar_.Add(this, chrome::NOTIFICATION_REQUIRE_PIN_SETTING_CHANGE_ENDED,
       content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_ENTER_PIN_ENDED,
       content::NotificationService::AllSources());
   cros_ = chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   if (cros_) {
     cros_->AddNetworkManagerObserver(this);
@@ skipping 1261 matching lines @@
   const base::Value* default_value = ui_data.default_value();
   if (default_value)
     value_dict->Set(kTagDefault, default_value->DeepCopy());
   if (ui_data.managed())
     value_dict->SetString(kTagControlledBy, kTagPolicy);
   else if (ui_data.recommended())
     value_dict->SetString(kTagControlledBy, kTagRecommended);
   settings->Set(key, value_dict);
 }
 
-}  // namespace options2
+}  // namespace options