views: Make everything in crypto module password dialog private except the ctor.

chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc

Index: chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc
diff --git a/chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc b/chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc
index e18e86759a7042869a40f6b3c0324c8e7dfe381a..eaca9be964872cbb081659b595c8ca3fcc5645cc 100644
--- a/chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc
+++ b/chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc
@@ -1,50 +1,54 @@
 // 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/views/crypto_module_password_dialog_view.h"
+
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/crypto_module_password_dialog.h"
-#include "chrome/browser/ui/views/crypto_module_password_dialog_view.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/controls/textfield/textfield.h"
 
-std::string kSlotName = "slot";
-std::string kServer = "server";
+const char kSlotName[] = "slot";

[Peter Kasting, 2012/04/16 22:31:13]

Nit: These can just go in CreateCryptoDialog()

+const char kServer[] = "server";
 
 namespace browser {
-CryptoModulePasswordReason kReason = kCryptoModulePasswordKeygen;
 
 class CryptoModulePasswordDialogViewTest : public testing::Test {
  public:
   CryptoModulePasswordDialogViewTest() {}
   ~CryptoModulePasswordDialogViewTest() {}
+
   void Capture(const char* text) {
     text_ = text;
   }
-  void CreateDialogCrypto(const CryptoModulePasswordCallback& callback) {
-    dialog_.reset(new CryptoModulePasswordDialogView(
-        kSlotName, kReason, kServer, callback));
+
+  void CreateCryptoDialog(const CryptoModulePasswordCallback& callback) {
+    dialog_.reset(new CryptoModulePasswordDialogView(kSlotName,
+        kCryptoModulePasswordKeygen, kServer, callback));
   }
-  browser::CryptoModulePasswordCallback* callback_;
+
+  CryptoModulePasswordCallback* callback_;
   std::string text_;
   scoped_ptr<CryptoModulePasswordDialogView> dialog_;
 };
 
 TEST_F(CryptoModulePasswordDialogViewTest, TestAccept) {
-  browser::CryptoModulePasswordCallback cb(
-      base::Bind(&browser::CryptoModulePasswordDialogViewTest::Capture,
+  CryptoModulePasswordCallback cb(
+      base::Bind(&CryptoModulePasswordDialogViewTest::Capture,
                  base::Unretained(this)));
-  CreateDialogCrypto(cb);
+  CreateCryptoDialog(cb);
   EXPECT_EQ(dialog_->password_entry_, dialog_->GetInitiallyFocusedView());
   EXPECT_TRUE(dialog_->GetModalType() != ui::MODAL_TYPE_NONE);
   const std::string kPassword = "diAl0g";
-  dialog_->password_entry_->SetText(UTF8ToUTF16(kPassword));
+  dialog_->password_entry_->SetText(ASCIIToUTF16(kPassword));
   EXPECT_TRUE(dialog_->Accept());
   EXPECT_EQ(kPassword, text_);
   const string16 empty;
   EXPECT_EQ(empty, dialog_->password_entry_->text());
 }
+
 }  // namespace browser