clang/win: Let remaining chromium_code targets build with -Wextra.

ui/base/ime/remote_input_method_win_unittest.cc

 // Copyright 2013 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 "ui/base/ime/remote_input_method_win.h"
 
 #include <InputScope.h>
 
 #include <vector>
 
@@ skipping 317 matching lines @@
   input_method->SetFocusedTextInputClient(&mock_text_input_client);
 
   RemoteInputMethodPrivateWin* private_ptr =
       RemoteInputMethodPrivateWin::Get(input_method.get());
   ASSERT_TRUE(private_ptr != NULL);
   MockRemoteInputMethodDelegateWin mock_remote_delegate;
   private_ptr->SetRemoteDelegate(&mock_remote_delegate);
 
   // Initial state must be synced.
   EXPECT_TRUE(mock_remote_delegate.text_input_client_updated_called());
-  ASSERT_EQ(1, mock_remote_delegate.composition_character_bounds().size());
+  ASSERT_EQ(1u, mock_remote_delegate.composition_character_bounds().size());
   EXPECT_EQ(gfx::Rect(10, 0, 10, 20),
             mock_remote_delegate.composition_character_bounds()[0]);
-  ASSERT_EQ(1, mock_remote_delegate.input_scopes().size());
+  ASSERT_EQ(1u, mock_remote_delegate.input_scopes().size());
   EXPECT_EQ(IS_URL, mock_remote_delegate.input_scopes()[0]);
 
   // State must be cleared by SetFocusedTextInputClient(NULL).
   mock_remote_delegate.Reset();
   input_method->SetFocusedTextInputClient(NULL);
   EXPECT_TRUE(mock_remote_delegate.text_input_client_updated_called());
   EXPECT_TRUE(mock_remote_delegate.composition_character_bounds().empty());
   EXPECT_TRUE(mock_remote_delegate.input_scopes().empty());
 }
 
 TEST(RemoteInputMethodWinTest, DetachTextInputClient) {
   MockInputMethodDelegate delegate_;
   MockTextInputClient mock_text_input_client;
   scoped_ptr<InputMethod> input_method(CreateRemoteInputMethodWin(&delegate_));
 
   mock_text_input_client.set_caret_bounds(gfx::Rect(10, 0, 10, 20));
   mock_text_input_client.set_text_input_type(ui::TEXT_INPUT_TYPE_URL);
   input_method->SetFocusedTextInputClient(&mock_text_input_client);
 
   RemoteInputMethodPrivateWin* private_ptr =
       RemoteInputMethodPrivateWin::Get(input_method.get());
   ASSERT_TRUE(private_ptr != NULL);
   MockRemoteInputMethodDelegateWin mock_remote_delegate;
   private_ptr->SetRemoteDelegate(&mock_remote_delegate);
 
   // Initial state must be synced.
   EXPECT_TRUE(mock_remote_delegate.text_input_client_updated_called());
-  ASSERT_EQ(1, mock_remote_delegate.composition_character_bounds().size());
+  ASSERT_EQ(1u, mock_remote_delegate.composition_character_bounds().size());
   EXPECT_EQ(gfx::Rect(10, 0, 10, 20),
     mock_remote_delegate.composition_character_bounds()[0]);
-  ASSERT_EQ(1, mock_remote_delegate.input_scopes().size());
+  ASSERT_EQ(1u, mock_remote_delegate.input_scopes().size());
   EXPECT_EQ(IS_URL, mock_remote_delegate.input_scopes()[0]);
 
   // State must be cleared by DetachTextInputClient
   mock_remote_delegate.Reset();
   input_method->DetachTextInputClient(&mock_text_input_client);
   EXPECT_TRUE(mock_remote_delegate.text_input_client_updated_called());
   EXPECT_TRUE(mock_remote_delegate.composition_character_bounds().empty());
   EXPECT_TRUE(mock_remote_delegate.input_scopes().empty());
 }
 
 TEST(RemoteInputMethodWinTest, OnCaretBoundsChanged) {
   MockInputMethodDelegate delegate_;
   MockTextInputClient mock_text_input_client;
   scoped_ptr<InputMethod> input_method(CreateRemoteInputMethodWin(&delegate_));
 
   // This must not cause a crash.
   input_method->OnCaretBoundsChanged(&mock_text_input_client);
 
   mock_text_input_client.set_caret_bounds(gfx::Rect(10, 0, 10, 20));
   input_method->SetFocusedTextInputClient(&mock_text_input_client);
 
   RemoteInputMethodPrivateWin* private_ptr =
       RemoteInputMethodPrivateWin::Get(input_method.get());
   ASSERT_TRUE(private_ptr != NULL);
   MockRemoteInputMethodDelegateWin mock_remote_delegate;
   private_ptr->SetRemoteDelegate(&mock_remote_delegate);
 
   // Initial state must be synced.
   EXPECT_TRUE(mock_remote_delegate.text_input_client_updated_called());
-  ASSERT_EQ(1, mock_remote_delegate.composition_character_bounds().size());
+  ASSERT_EQ(1u, mock_remote_delegate.composition_character_bounds().size());
   EXPECT_EQ(gfx::Rect(10, 0, 10, 20),
       mock_remote_delegate.composition_character_bounds()[0]);
 
   // Redundant OnCaretBoundsChanged must be ignored.
   mock_remote_delegate.Reset();
   input_method->OnCaretBoundsChanged(&mock_text_input_client);
   EXPECT_FALSE(mock_remote_delegate.text_input_client_updated_called());
 
   // Check OnCaretBoundsChanged is handled. (w/o composition)
   mock_remote_delegate.Reset();
   mock_text_input_client.Reset();
   mock_text_input_client.set_caret_bounds(gfx::Rect(10, 20, 30, 40));
   input_method->OnCaretBoundsChanged(&mock_text_input_client);
   EXPECT_TRUE(mock_remote_delegate.text_input_client_updated_called());
-  ASSERT_EQ(1, mock_remote_delegate.composition_character_bounds().size());
+  ASSERT_EQ(1u, mock_remote_delegate.composition_character_bounds().size());
   EXPECT_EQ(gfx::Rect(10, 20, 30, 40),
       mock_remote_delegate.composition_character_bounds()[0]);
 
   // Check OnCaretBoundsChanged is handled. (w/ composition)
   {
     mock_remote_delegate.Reset();
     mock_text_input_client.Reset();
 
     std::vector<gfx::Rect> bounds;
     bounds.push_back(gfx::Rect(10, 20, 30, 40));
@@ skipping 49 matching lines @@
   input_method->SetFocusedTextInputClient(&mock_text_input_client);
 
   RemoteInputMethodPrivateWin* private_ptr =
       RemoteInputMethodPrivateWin::Get(input_method.get());
   ASSERT_TRUE(private_ptr != NULL);
   MockRemoteInputMethodDelegateWin mock_remote_delegate;
   private_ptr->SetRemoteDelegate(&mock_remote_delegate);
 
   // Initial state must be synced.
   EXPECT_TRUE(mock_remote_delegate.text_input_client_updated_called());
-  ASSERT_EQ(1, mock_remote_delegate.input_scopes().size());
+  ASSERT_EQ(1u, mock_remote_delegate.input_scopes().size());
   EXPECT_EQ(IS_URL, mock_remote_delegate.input_scopes()[0]);
 
   // Check TEXT_INPUT_TYPE_NONE is handled.
   mock_remote_delegate.Reset();
   mock_text_input_client.Reset();
   mock_text_input_client.set_text_input_type(ui::TEXT_INPUT_TYPE_NONE);
   mock_text_input_client.set_text_input_mode(ui::TEXT_INPUT_MODE_KATAKANA);
   input_method->OnTextInputTypeChanged(&mock_text_input_client);
   EXPECT_TRUE(mock_remote_delegate.text_input_client_updated_called());
   EXPECT_TRUE(mock_remote_delegate.input_scopes().empty());
@@ skipping 111 matching lines @@
   scoped_ptr<InputMethod> input_method(CreateRemoteInputMethodWin(&delegate_));
 
   ui::KeyEvent new_keydown(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE);
   new_keydown.set_character(L'A');
   ui::KeyEvent fabricated_keydown(new_keydown);
 
   // This must not cause a crash.
   input_method->DispatchKeyEvent(&fabricated_keydown);
   EXPECT_TRUE(fabricated_keydown.handled());
   EXPECT_TRUE(mock_text_input_client.inserted_text().empty());
-  ASSERT_EQ(1, delegate_.fabricated_key_events().size());
+  ASSERT_EQ(1u, delegate_.fabricated_key_events().size());
   EXPECT_EQ(L'A', delegate_.fabricated_key_events()[0]);
   delegate_.Reset();
   mock_text_input_client.Reset();
 
   RemoteInputMethodPrivateWin* private_ptr =
       RemoteInputMethodPrivateWin::Get(input_method.get());
   ASSERT_TRUE(private_ptr != NULL);
   MockRemoteInputMethodDelegateWin mock_remote_delegate;
   private_ptr->SetRemoteDelegate(&mock_remote_delegate);
 
   // TextInputClient is not focused yet here.
   fabricated_keydown = new_keydown;
   input_method->DispatchKeyEvent(&fabricated_keydown);
   EXPECT_TRUE(fabricated_keydown.handled());
   EXPECT_TRUE(mock_text_input_client.inserted_text().empty());
-  ASSERT_EQ(1, delegate_.fabricated_key_events().size());
+  ASSERT_EQ(1u, delegate_.fabricated_key_events().size());
   EXPECT_EQ(L'A', delegate_.fabricated_key_events()[0]);
   delegate_.Reset();
   mock_text_input_client.Reset();
 
   input_method->SetFocusedTextInputClient(&mock_text_input_client);
   // TextInputClient is now focused here.
   fabricated_keydown = new_keydown;
   input_method->DispatchKeyEvent(&fabricated_keydown);
   EXPECT_TRUE(fabricated_keydown.handled());
   EXPECT_TRUE(mock_text_input_client.inserted_text().empty());
-  ASSERT_EQ(1, delegate_.fabricated_key_events().size());
+  ASSERT_EQ(1u, delegate_.fabricated_key_events().size());
   EXPECT_EQ(L'A', delegate_.fabricated_key_events()[0]);
   delegate_.Reset();
   mock_text_input_client.Reset();
 
   input_method->SetDelegate(NULL);
   // RemoteInputMethodDelegateWin is no longer set here.
   fabricated_keydown = new_keydown;
   input_method->DispatchKeyEvent(&fabricated_keydown);
   EXPECT_FALSE(fabricated_keydown.handled());
   EXPECT_TRUE(mock_text_input_client.inserted_text().empty());
@@ skipping 54 matching lines @@
       RemoteInputMethodPrivateWin::Get(input_method.get());
   ASSERT_TRUE(private_ptr != NULL);
   MockRemoteInputMethodDelegateWin mock_remote_delegate;
   private_ptr->SetRemoteDelegate(&mock_remote_delegate);
 
   CompositionText composition_text;
 
   // TextInputClient is not focused yet here.
 
   private_ptr->OnCompositionChanged(composition_text);
-  EXPECT_EQ(0, mock_text_input_client.call_count_set_composition_text());
+  EXPECT_EQ(0u, mock_text_input_client.call_count_set_composition_text());
   delegate_.Reset();
   mock_text_input_client.Reset();
 
   input_method->SetFocusedTextInputClient(&mock_text_input_client);
 
   // TextInputClient is now focused here.
 
   private_ptr->OnCompositionChanged(composition_text);
-  EXPECT_EQ(1, mock_text_input_client.call_count_set_composition_text());
+  EXPECT_EQ(1u, mock_text_input_client.call_count_set_composition_text());
   delegate_.Reset();
   mock_text_input_client.Reset();
 }
 
 TEST(RemoteInputMethodWinTest, OnTextCommitted) {
   MockInputMethodDelegate delegate_;
   MockTextInputClient mock_text_input_client;
   scoped_ptr<InputMethod> input_method(CreateRemoteInputMethodWin(&delegate_));
 
   RemoteInputMethodPrivateWin* private_ptr =
       RemoteInputMethodPrivateWin::Get(input_method.get());
   ASSERT_TRUE(private_ptr != NULL);
   MockRemoteInputMethodDelegateWin mock_remote_delegate;
   private_ptr->SetRemoteDelegate(&mock_remote_delegate);
 
   base::string16 committed_text = L"Hello";
 
   // TextInputClient is not focused yet here.
 
   mock_text_input_client.set_text_input_type(TEXT_INPUT_TYPE_TEXT);
   private_ptr->OnTextCommitted(committed_text);
-  EXPECT_EQ(0, mock_text_input_client.call_count_insert_char());
-  EXPECT_EQ(0, mock_text_input_client.call_count_insert_text());
+  EXPECT_EQ(0u, mock_text_input_client.call_count_insert_char());
+  EXPECT_EQ(0u, mock_text_input_client.call_count_insert_text());
   EXPECT_EQ(L"", mock_text_input_client.inserted_text());
   delegate_.Reset();
   mock_text_input_client.Reset();
 
   input_method->SetFocusedTextInputClient(&mock_text_input_client);
 
   // TextInputClient is now focused here.
 
   mock_text_input_client.set_text_input_type(TEXT_INPUT_TYPE_TEXT);
   private_ptr->OnTextCommitted(committed_text);
-  EXPECT_EQ(0, mock_text_input_client.call_count_insert_char());
-  EXPECT_EQ(1, mock_text_input_client.call_count_insert_text());
+  EXPECT_EQ(0u, mock_text_input_client.call_count_insert_char());
+  EXPECT_EQ(1u, mock_text_input_client.call_count_insert_text());
   EXPECT_EQ(committed_text, mock_text_input_client.inserted_text());
   delegate_.Reset();
   mock_text_input_client.Reset();
 
   // When TextInputType is TEXT_INPUT_TYPE_NONE, TextInputClient::InsertText
   // should not be used.
   mock_text_input_client.set_text_input_type(TEXT_INPUT_TYPE_NONE);
   private_ptr->OnTextCommitted(committed_text);
   EXPECT_EQ(committed_text.size(),
             mock_text_input_client.call_count_insert_char());
-  EXPECT_EQ(0, mock_text_input_client.call_count_insert_text());
+  EXPECT_EQ(0u, mock_text_input_client.call_count_insert_text());
   EXPECT_EQ(committed_text, mock_text_input_client.inserted_text());
   delegate_.Reset();
   mock_text_input_client.Reset();
 }
 
 TEST(RemoteInputMethodWinTest, OnTextInputStateChanged_Observer) {
   DummyTextInputClient text_input_client;
   DummyTextInputClient text_input_client_the_other;
 
   MockInputMethodObserver input_method_observer;
@@ skipping 34 matching lines @@
   scoped_ptr<InputMethod> input_method(CreateRemoteInputMethodWin(&delegate_));
   input_method->AddObserver(&input_method_observer);
 
   EXPECT_EQ(0u, input_method_observer.on_input_method_destroyed_changed());
   input_method.reset();
   EXPECT_EQ(1u, input_method_observer.on_input_method_destroyed_changed());
 }
 
 }  // namespace
 }  // namespace ui