Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/content_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/content_settings_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 267 matching lines @@
   return net::CanonicalizeHost(host, &info);
 }
 
 bool IsValidHost(const std::string& host) {
   std::string canonicalized_host = CanonicalizeHost(host);
   return !canonicalized_host.empty();
 }
 
 }  // namespace
 
-namespace options2 {
+namespace options {
 
 class ContentSettingsHandler::ExContentSettingsType {
  public:
   explicit ExContentSettingsType(int value) : value_(value) {
     DCHECK(value_ < EX_CONTENT_SETTINGS_NUM_TYPES);
   }
   explicit ExContentSettingsType(ContentSettingsType type) : value_(type) {}
   explicit ExContentSettingsType(ExContentSettingsTypeEnum type)
       : value_(type) {}
 
@@ skipping 1032 matching lines @@
     const ExContentSettingsType& type) {
   for (size_t i = 0; i < arraysize(kExContentSettingsTypeGroupNames); ++i) {
     if (type == kExContentSettingsTypeGroupNames[i].type)
       return kExContentSettingsTypeGroupNames[i].name;
   }
 
   NOTREACHED();
   return std::string();
 }
 
-}  // namespace options2
+}  // namespace options