Avoid casts.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/6737027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80440 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 17 insertions, 16 deletions

diff --git a/chrome/browser/chromeos/login/google_authenticator_unittest.cc b/chrome/browser/chromeos/login/google_authenticator_unittest.cc
index 05277b8..2f19588 100644
--- a/chrome/browser/chromeos/login/google_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/google_authenticator_unittest.cc
@@ -94,7 +94,7 @@ class GoogleAuthenticatorTest : public ::testing::Test {
   FilePath PopulateTempFile(const char* data, int data_len) {
     FilePath out;
     FILE* tmp_file = CreateAndOpenTemporaryFile(&out);
-    EXPECT_NE(tmp_file, reinterpret_cast<FILE*>(NULL));
+    EXPECT_NE(tmp_file, static_cast<FILE*>(NULL));
     EXPECT_EQ(WriteFile(out, data, data_len), data_len);
     EXPECT_TRUE(CloseFile(tmp_file));
     return out;
@@ -107,7 +107,7 @@ class GoogleAuthenticatorTest : public ::testing::Test {
     FILE* tmp_file = CreateAndOpenTemporaryFileInDir(exe_dir,
                                                      &local_account_file);
     int ascii_len = ascii.length();
-    EXPECT_NE(tmp_file, reinterpret_cast<FILE*>(NULL));
+    EXPECT_NE(tmp_file, static_cast<FILE*>(NULL));
     EXPECT_EQ(WriteFile(local_account_file, ascii.c_str(), ascii_len),
               ascii_len);
     EXPECT_TRUE(CloseFile(tmp_file));
diff --git a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
index d5ef94b..e079941 100644
--- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
@@ -117,7 +117,7 @@ class ParallelAuthenticatorTest : public ::testing::Test {
   FilePath PopulateTempFile(const char* data, int data_len) {
     FilePath out;
     FILE* tmp_file = CreateAndOpenTemporaryFile(&out);
-    EXPECT_NE(tmp_file, reinterpret_cast<FILE*>(NULL));
+    EXPECT_NE(tmp_file, static_cast<FILE*>(NULL));
     EXPECT_EQ(WriteFile(out, data, data_len), data_len);
     EXPECT_TRUE(CloseFile(tmp_file));
     return out;
@@ -130,7 +130,7 @@ class ParallelAuthenticatorTest : public ::testing::Test {
     FILE* tmp_file = CreateAndOpenTemporaryFileInDir(exe_dir,
                                                      &local_account_file);
     int ascii_len = ascii.length();
-    EXPECT_NE(tmp_file, reinterpret_cast<FILE*>(NULL));
+    EXPECT_NE(tmp_file, static_cast<FILE*>(NULL));
     EXPECT_EQ(WriteFile(local_account_file, ascii.c_str(), ascii_len),
               ascii_len);
     EXPECT_TRUE(CloseFile(tmp_file));
diff --git a/chrome/browser/chromeos/login/signed_settings_unittest.cc b/chrome/browser/chromeos/login/signed_settings_unittest.cc
index af49450..90e2f30 100644
--- a/chrome/browser/chromeos/login/signed_settings_unittest.cc
+++ b/chrome/browser/chromeos/login/signed_settings_unittest.cc
@@ -391,7 +391,7 @@ TEST_F(SignedSettingsTest, RetrievePropertyNotFound) {
   MockLoginLibrary* lib = MockLoginLib();
   EXPECT_CALL(*lib, RequestRetrieveProperty(fake_prop_, _, _))
       .WillOnce(
-          InvokeArgument<1>(reinterpret_cast<void*>(s.get()),
+          InvokeArgument<1>(static_cast<void*>(s.get()),
                             false,
                             static_cast<chromeos::Property*>(NULL)))
       .RetiresOnSaturation();
@@ -436,7 +436,7 @@ TEST_F(SignedSettingsTest, SignAndStorePolicy) {
 
   MockLoginLibrary* lib = MockLoginLib();
   EXPECT_CALL(*lib, RequestStorePolicy(StrEq(signed_serialized), _, &d))
-      .WillOnce(InvokeArgument<1>(reinterpret_cast<void*>(&d), true))
+      .WillOnce(InvokeArgument<1>(static_cast<void*>(&d), true))
       .RetiresOnSaturation();
   s->OnKeyOpComplete(OwnerManager::SUCCESS, fake_sig);
   UnMockLoginLib();
@@ -454,7 +454,7 @@ TEST_F(SignedSettingsTest, StoreSignedPolicy) {
       SignedSettings::CreateStorePolicyOp(&fake_policy, &d));
   MockLoginLibrary* lib = MockLoginLib();
   EXPECT_CALL(*lib, RequestStorePolicy(StrEq(serialized), _, &d))
-      .WillOnce(InvokeArgument<1>(reinterpret_cast<void*>(&d), true))
+      .WillOnce(InvokeArgument<1>(static_cast<void*>(&d), true))
       .RetiresOnSaturation();
   s->Execute();
   message_loop_.RunAllPending();
@@ -495,7 +495,7 @@ TEST_F(SignedSettingsTest, RetrievePolicy) {
 
   MockLoginLibrary* lib = MockLoginLib();
   EXPECT_CALL(*lib, RequestRetrievePolicy(_, s.get()))
-      .WillOnce(InvokeArgument<0>(reinterpret_cast<void*>(s.get()),
+      .WillOnce(InvokeArgument<0>(static_cast<void*>(s.get()),
                                   signed_serialized.c_str()))
       .RetiresOnSaturation();
 
@@ -521,7 +521,7 @@ TEST_F(SignedSettingsTest, RetrieveNoPolicy) {
   MockLoginLibrary* lib = MockLoginLib();
   EXPECT_CALL(*lib, RequestRetrievePolicy(_, s.get()))
       .WillOnce(InvokeArgument<0>(static_cast<void*>(s.get()),
-                                  reinterpret_cast<const char*>(NULL)))
+                                  static_cast<const char*>(NULL)))
       .RetiresOnSaturation();
 
   s->Execute();
@@ -540,7 +540,7 @@ TEST_F(SignedSettingsTest, RetrieveUnsignedPolicy) {
 
   MockLoginLibrary* lib = MockLoginLib();
   EXPECT_CALL(*lib, RequestRetrievePolicy(_, s.get()))
-      .WillOnce(InvokeArgument<0>(reinterpret_cast<void*>(s.get()),
+      .WillOnce(InvokeArgument<0>(static_cast<void*>(s.get()),
                                   serialized.c_str()))
       .RetiresOnSaturation();
 
@@ -560,7 +560,7 @@ TEST_F(SignedSettingsTest, RetrieveMalsignedPolicy) {
 
   MockLoginLibrary* lib = MockLoginLib();
   EXPECT_CALL(*lib, RequestRetrievePolicy(_, s.get()))
-      .WillOnce(InvokeArgument<0>(reinterpret_cast<void*>(s.get()),
+      .WillOnce(InvokeArgument<0>(static_cast<void*>(s.get()),
                                   signed_serialized.c_str()))
       .RetiresOnSaturation();
 
diff --git a/chrome/browser/chromeos/login/views_login_display.cc b/chrome/browser/chromeos/login/views_login_display.cc
index 8c54ac9..2f242fe 100644
--- a/chrome/browser/chromeos/login/views_login_display.cc
+++ b/chrome/browser/chromeos/login/views_login_display.cc
@@ -150,20 +150,21 @@ void ViewsLoginDisplay::OnUserRemoved(const std::string& username) {
     return;
 
   // Insert just before guest or add new user pods if any.
-  int new_size = static_cast<int>(controllers_.size());
-  int insert_position = new_size;
+  size_t new_size = controllers_.size();
+  size_t insert_position = new_size;
   while (insert_position > 0 &&
          (controllers_[insert_position - 1]->is_new_user() ||
-          controllers_[insert_position - 1]->is_guest()))
+          controllers_[insert_position - 1]->is_guest())) {
     --insert_position;
+  }
 
   controllers_.insert(controllers_.begin() + insert_position,
                       invisible_controllers_[0]);
   invisible_controllers_.erase(invisible_controllers_.begin());
 
   // Update counts for exiting pods.
-  new_size = static_cast<int>(controllers_.size());
-  for (int i = 0; i < new_size; ++i) {
+  new_size = controllers_.size();
+  for (size_t i = 0; i < new_size; ++i) {
     if (i != insert_position)
       controllers_[i]->UpdateUserCount(i, new_size);
   }