Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/core_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/core_options_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 13 matching lines @@
 #include "content/public/browser/web_ui.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::UserMetricsAction;
 
-namespace options2 {
+namespace options {
 
 CoreOptionsHandler::CoreOptionsHandler()
     : handlers_host_(NULL) {
 }
 
 CoreOptionsHandler::~CoreOptionsHandler() {}
 
 void CoreOptionsHandler::InitializeHandler() {
   plugin_status_pref_setter_.Init(Profile::FromWebUI(web_ui()), this);
 }
@@ skipping 428 matching lines @@
 }
 
 void CoreOptionsHandler::UpdatePepperFlashSettingsEnabled() {
   scoped_ptr<base::Value> enabled(
       base::Value::CreateBooleanValue(
           plugin_status_pref_setter_.IsPepperFlashSettingsEnabled()));
   web_ui()->CallJavascriptFunction(
       "OptionsPage.setPepperFlashSettingsEnabled", *enabled);
 }
 
-}  // namespace options2
+}  // namespace options