Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/certificate_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/certificate_manager_handler.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 91 matching lines @@
     case net::ERR_IMPORT_CERT_ALREADY_EXISTS:
       return l10n_util::GetStringUTF8(
           IDS_CERT_MANAGER_ERROR_CERT_ALREADY_EXISTS);
     default:
       return l10n_util::GetStringUTF8(IDS_CERT_MANAGER_UNKNOWN_ERROR);
   }
 }
 
 }  // namespace
 
-namespace options2 {
+namespace options {
 
 ///////////////////////////////////////////////////////////////////////////////
 //  CertIdMap
 
 class CertIdMap {
  public:
   CertIdMap() {}
   ~CertIdMap() {}
 
   std::string CertToId(net::X509Certificate* cert);
@@ skipping 961 matching lines @@
       call_status == chromeos::DBUS_METHOD_CALL_SUCCESS && is_tpm_token_ready);
   web_ui()->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady",
                                    ready);
 }
 #endif
 
 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
   return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow();
 }
 
-}  // namespace options2
+}  // namespace options