Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/search_engine_manager_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/search_engine_manager_handler.h"
 
 #include "base/bind.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 13 matching lines @@
 namespace {
 
 enum EngineInfoIndexes {
   ENGINE_NAME,
   ENGINE_KEYWORD,
   ENGINE_URL,
 };
 
 };  // namespace
 
-namespace options2 {
+namespace options {
 
 SearchEngineManagerHandler::SearchEngineManagerHandler() {
 }
 
 SearchEngineManagerHandler::~SearchEngineManagerHandler() {
   if (list_controller_.get() && list_controller_->table_model())
     list_controller_->table_model()->SetObserver(NULL);
 }
 
 void SearchEngineManagerHandler::InitializeHandler() {
@@ skipping 262 matching lines @@
     return;
   }
   // Recheck validity.  It's possible to get here with invalid input if e.g. the
   // user calls the right JS functions directly from the web inspector.
   if (edit_controller_->IsTitleValid(name) &&
       edit_controller_->IsKeywordValid(keyword) &&
       edit_controller_->IsURLValid(url))
     edit_controller_->AcceptAddOrEdit(name, keyword, url);
 }
 
-}  // namespace options2
+}  // namespace options