Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/autofill_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/autofill_options_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 243 matching lines @@
   const ListValue* extracted_list = NULL;
   ExtractPhoneNumberInformation(args, &index, &extracted_list, &country_code);
 
   scoped_ptr<ListValue> list(extracted_list->DeepCopy());
   RemoveDuplicatePhoneNumberAtIndex(index, country_code, list.get());
   return list.Pass();
 }
 
 }  // namespace
 
-namespace options2 {
+namespace options {
 
 AutofillOptionsHandler::AutofillOptionsHandler()
     : personal_data_(NULL) {
 }
 
 AutofillOptionsHandler::~AutofillOptionsHandler() {
   if (personal_data_)
     personal_data_->RemoveObserver(this);
 }
 
@@ skipping 344 matching lines @@
   scoped_ptr<ListValue> list_value = ValidatePhoneArguments(args);
 
   web_ui()->CallJavascriptFunction(
     "AutofillEditAddressOverlay.setValidatedPhoneNumbers", *list_value);
 }
 
 bool AutofillOptionsHandler::IsPersonalDataLoaded() const {
   return personal_data_ && personal_data_->IsDataLoaded();
 }
 
-}  // namespace options2
+}  // namespace options