Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/web_intents_settings_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/web_intents_settings_handler.h"
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/intents/web_intents_registry.h"
 #include "chrome/browser/intents/web_intents_registry_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/l10n/l10n_util.h"
 
-namespace options2 {
+namespace options {
 
 WebIntentsSettingsHandler::WebIntentsSettingsHandler()
     : web_intents_registry_(NULL),
       batch_update_(false) {
 }
 
 WebIntentsSettingsHandler::~WebIntentsSettingsHandler() {
 }
 
 void WebIntentsSettingsHandler::GetLocalizedValues(
@@ skipping 119 matching lines @@
 
   ListValue args;
   args.Append(parent == intents_tree_model_->GetRoot() ?
       Value::CreateNullValue() :
       Value::CreateStringValue(intents_tree_model_->GetTreeNodeId(parent)));
   args.Append(children);
 
   web_ui()->CallJavascriptFunction("IntentsView.loadChildren", args);
 }
 
-}  // namespace options2
+}  // namespace options