chrome: Move chrome/browser/ui/crypto files out of chrome namespace.

From discussion on chromium-dev, it was decided to remove 'chrome'
namespace.

TBR=sky@chromium.org

Bug: 289619
Change-Id: I7a3769cfb30db3a2bb8d761f646cf23f1582f972
Reviewed-on: https://chromium-review.googlesource.com/787810Reviewed-by: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Chandramouli Sanchi <cm.sanchi@samsung.com>
Cr-Commit-Position: refs/heads/master@{#521139}

chrome/browser/certificate_manager_model.cc

@@ -121,7 +121,7 @@ void CertificateManagerModel::Refresh() {
   cert_db_->ListModules(&modules, false);
   DVLOG(1) << "refresh waiting for unlocking...";
   chrome::UnlockSlotsIfNecessary(
-      std::move(modules), chrome::kCryptoModulePasswordListCerts,
+      std::move(modules), kCryptoModulePasswordListCerts,
       net::HostPortPair(),  // unused.
       NULL,                 // TODO(mattm): supply parent window.
       base::Bind(&CertificateManagerModel::RefreshSlotsUnlocked,

chrome/browser/profiles/profile_io_data.cc

@@ -980,11 +980,11 @@ std::unique_ptr<net::ClientCertStore> ProfileIOData::CreateClientCertStore() {
           base::MakeUnique<chromeos::ClientCertFilterChromeOS>(
               use_system_key_slot_, username_hash_),
           base::Bind(&CreateCryptoModuleBlockingPasswordDelegate,
-                     chrome::kCryptoModulePasswordClientAuth)));
+                     kCryptoModulePasswordClientAuth)));
 #elif defined(USE_NSS_CERTS)
   return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreNSS(
       base::Bind(&CreateCryptoModuleBlockingPasswordDelegate,
-                 chrome::kCryptoModulePasswordClientAuth)));
+                 kCryptoModulePasswordClientAuth)));
 #elif defined(OS_WIN)
   return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreWin());
 #elif defined(OS_MACOSX)

chrome/browser/ui/crypto_module_delegate_nss.cc

@@ -12,7 +12,7 @@
 using content::BrowserThread;
 
 ChromeNSSCryptoModuleDelegate::ChromeNSSCryptoModuleDelegate(
-    chrome::CryptoModulePasswordReason reason,
+    CryptoModulePasswordReason reason,
     const net::HostPortPair& server)
     : reason_(reason),
       server_(server),
@@ -66,8 +66,7 @@ void ChromeNSSCryptoModuleDelegate::GotPassword(const std::string& password) {
 }
 
 crypto::CryptoModuleBlockingPasswordDelegate*
-CreateCryptoModuleBlockingPasswordDelegate(
-    chrome::CryptoModulePasswordReason reason,
+CreateCryptoModuleBlockingPasswordDelegate(CryptoModulePasswordReason reason,
                                            const net::HostPortPair& server) {
   return new ChromeNSSCryptoModuleDelegate(reason, server);
 }

chrome/browser/ui/crypto_module_delegate_nss.h

@@ -22,7 +22,7 @@ class ChromeNSSCryptoModuleDelegate
   // Create a ChromeNSSCryptoModuleDelegate. |reason| is used to select what
   // string to show the user, |server| is displayed to indicate which connection
   // is causing the dialog to appear. |slot| can be NULL.
-  ChromeNSSCryptoModuleDelegate(chrome::CryptoModulePasswordReason reason,
+  ChromeNSSCryptoModuleDelegate(CryptoModulePasswordReason reason,
                                 const net::HostPortPair& server);
 
   // crypto::CryptoModuleBlockingPasswordDelegate implementation.
@@ -40,7 +40,7 @@ class ChromeNSSCryptoModuleDelegate
   void GotPassword(const std::string& password);
 
   // Parameters displayed in the dialog.
-  const chrome::CryptoModulePasswordReason reason_;
+  const CryptoModulePasswordReason reason_;
   net::HostPortPair server_;
 
   // Event to block worker thread while waiting for dialog on UI thread.
@@ -55,8 +55,7 @@ class ChromeNSSCryptoModuleDelegate
 
 // Create a delegate which only handles unlocking slots.
 crypto::CryptoModuleBlockingPasswordDelegate*
-    CreateCryptoModuleBlockingPasswordDelegate(
-        chrome::CryptoModulePasswordReason reason,
+CreateCryptoModuleBlockingPasswordDelegate(CryptoModulePasswordReason reason,
                                            const net::HostPortPair& server);
 
 #endif  // CHROME_BROWSER_UI_CRYPTO_MODULE_DELEGATE_NSS_H_

chrome/browser/ui/crypto_module_password_dialog.h

@@ -10,8 +10,6 @@
 #include "base/callback.h"
 #include "ui/gfx/native_widget_types.h"
 
-namespace chrome {
-
 // An enum to describe the reason for the password request.
 enum CryptoModulePasswordReason {
   kCryptoModulePasswordCertEnrollment,
@@ -35,6 +33,4 @@ void ShowCryptoModulePasswordDialog(
     gfx::NativeWindow parent,
     const CryptoModulePasswordCallback& callback);
 
-}  // namespace chrome
-
 #endif  // CHROME_BROWSER_UI_CRYPTO_MODULE_PASSWORD_DIALOG_H_

chrome/browser/ui/crypto_module_password_dialog_nss.cc

@@ -26,7 +26,7 @@ bool ShouldShowDialog(PK11SlotInfo* slot) {
 class SlotUnlocker {
  public:
   SlotUnlocker(std::vector<crypto::ScopedPK11Slot> modules,
-               chrome::CryptoModulePasswordReason reason,
+               CryptoModulePasswordReason reason,
                const net::HostPortPair& server,
                gfx::NativeWindow parent,
                const base::Closure& callback);
@@ -39,7 +39,7 @@ class SlotUnlocker {
 
   size_t current_;
   std::vector<crypto::ScopedPK11Slot> modules_;
-  chrome::CryptoModulePasswordReason reason_;
+  CryptoModulePasswordReason reason_;
   net::HostPortPair server_;
   gfx::NativeWindow parent_;
   base::Closure callback_;
@@ -47,7 +47,7 @@ class SlotUnlocker {
 };
 
 SlotUnlocker::SlotUnlocker(std::vector<crypto::ScopedPK11Slot> modules,
-                           chrome::CryptoModulePasswordReason reason,
+                           CryptoModulePasswordReason reason,
                            const net::HostPortPair& server,
                            gfx::NativeWindow parent,
                            const base::Closure& callback)
@@ -118,7 +118,7 @@ void SlotUnlocker::Done() {
 namespace chrome {
 
 void UnlockSlotsIfNecessary(std::vector<crypto::ScopedPK11Slot> modules,
-                            chrome::CryptoModulePasswordReason reason,
+                            CryptoModulePasswordReason reason,
                             const net::HostPortPair& server,
                             gfx::NativeWindow parent,
                             const base::Closure& callback) {
@@ -134,7 +134,7 @@ void UnlockSlotsIfNecessary(std::vector<crypto::ScopedPK11Slot> modules,
 }
 
 void UnlockCertSlotIfNecessary(CERTCertificate* cert,
-                               chrome::CryptoModulePasswordReason reason,
+                               CryptoModulePasswordReason reason,
                                const net::HostPortPair& server,
                                gfx::NativeWindow parent,
                                const base::Closure& callback) {

chrome/browser/ui/views/crypto_module_password_dialog_view.cc

@@ -16,8 +16,6 @@
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/widget.h"
 
-namespace chrome {
-
 ////////////////////////////////////////////////////////////////////////////////
 // CryptoModulePasswordDialogView, public:
 
@@ -90,25 +88,25 @@ void CryptoModulePasswordDialogView::Init(const std::string& hostname,
   const base::string16& hostname16 = base::UTF8ToUTF16(hostname);
   const base::string16& slot16 = base::UTF8ToUTF16(slot_name);
   switch (reason) {
-    case chrome::kCryptoModulePasswordCertEnrollment:
+    case kCryptoModulePasswordCertEnrollment:
       text = l10n_util::GetStringFUTF8(
           IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CERT_ENROLLMENT,
           slot16,
           hostname16);
       break;
-    case chrome::kCryptoModulePasswordClientAuth:
+    case kCryptoModulePasswordClientAuth:
       text = l10n_util::GetStringFUTF8(
           IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CLIENT_AUTH, slot16, hostname16);
       break;
-    case chrome::kCryptoModulePasswordListCerts:
+    case kCryptoModulePasswordListCerts:
       text = l10n_util::GetStringFUTF8(
           IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_LIST_CERTS, slot16);
       break;
-    case chrome::kCryptoModulePasswordCertImport:
+    case kCryptoModulePasswordCertImport:
       text = l10n_util::GetStringFUTF8(
           IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CERT_IMPORT, slot16);
       break;
-    case chrome::kCryptoModulePasswordCertExport:
+    case kCryptoModulePasswordCertExport:
       text = l10n_util::GetStringFUTF8(
           IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CERT_EXPORT, slot16);
       break;
@@ -165,5 +163,3 @@ void ShowCryptoModulePasswordDialog(
       new CryptoModulePasswordDialogView(slot_name, reason, hostname, callback);
   views::DialogDelegate::CreateDialogWidget(dialog, NULL, parent)->Show();
 }
-
-}  // namespace chrome

chrome/browser/ui/views/crypto_module_password_dialog_view.h

@@ -18,8 +18,6 @@ class Label;
 class Textfield;
 }
 
-namespace chrome {
-
 class CryptoModulePasswordDialogView : public views::DialogDelegateView,
                                        public views::TextfieldController {
  public:
@@ -63,6 +61,4 @@ class CryptoModulePasswordDialogView : public views::DialogDelegateView,
   DISALLOW_COPY_AND_ASSIGN(CryptoModulePasswordDialogView);
 };
 
-}  // namespace chrome
-
 #endif  // CHROME_BROWSER_UI_VIEWS_CRYPTO_MODULE_PASSWORD_DIALOG_VIEW_H_

chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc

@@ -14,8 +14,6 @@
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/views_test_base.h"
 
-namespace chrome {
-
 class CryptoModulePasswordDialogViewTest : public views::ViewsTestBase {
  public:
   CryptoModulePasswordDialogViewTest() {}
@@ -56,5 +54,3 @@ TEST_F(CryptoModulePasswordDialogViewTest, TestAccept) {
   const base::string16 empty;
   EXPECT_EQ(empty, dialog_->password_entry_->text());
 }
-
-}  // namespace chrome

chrome/browser/ui/webui/certificates_handler.cc

@@ -582,7 +582,7 @@ void CertificatesHandler::HandleExportPersonalPasswordSelected(
 
   // TODO(mattm): do something smarter about non-extractable keys
   chrome::UnlockCertSlotIfNecessary(
-      selected_cert_list_[0].get(), chrome::kCryptoModulePasswordCertExport,
+      selected_cert_list_[0].get(), kCryptoModulePasswordCertExport,
       net::HostPortPair(),  // unused.
       GetParentWindow(),
       base::Bind(&CertificatesHandler::ExportPersonalSlotsUnlocked,
@@ -719,7 +719,7 @@ void CertificatesHandler::HandleImportPersonalPasswordSelected(
   std::vector<crypto::ScopedPK11Slot> modules;
   modules.push_back(crypto::ScopedPK11Slot(PK11_ReferenceSlot(slot_.get())));
   chrome::UnlockSlotsIfNecessary(
-      std::move(modules), chrome::kCryptoModulePasswordCertImport,
+      std::move(modules), kCryptoModulePasswordCertImport,
       net::HostPortPair(),  // unused.
       GetParentWindow(),
       base::Bind(&CertificatesHandler::ImportPersonalSlotUnlocked,