Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/chromeos/accounts_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/accounts_options_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 23 matching lines @@
   CrosSettings* cros_settings = CrosSettings::Get();
   if (cros_settings->FindEmailInList(kAccountsPrefUsers, username))
     return false;
   base::StringValue username_value(username);
   cros_settings->AppendToList(kAccountsPrefUsers, &username_value);
   return true;
 }
 
 }  // namespace
 
-namespace options2 {
+namespace options {
 
 AccountsOptionsHandler::AccountsOptionsHandler() {
 }
 
 AccountsOptionsHandler::~AccountsOptionsHandler() {
 }
 
 void AccountsOptionsHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("whitelistUser",
       base::Bind(&AccountsOptionsHandler::HandleWhitelistUser,
@@ skipping 73 matching lines @@
   else
     new_list.reset(new base::ListValue);
 
   const UserList& users = UserManager::Get()->GetUsers();
   for (UserList::const_iterator it = users.begin(); it < users.end(); ++it)
     new_list->AppendIfNotPresent(new base::StringValue((*it)->email()));
 
   cros_settings->Set(kAccountsPrefUsers, *new_list.get());
 }
 
-}  // namespace options2
+}  // namespace options
 }  // namespace chromeos