Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/ime/remote_input_method_win_unittest.cc

Issue 1513043002: clang/win: Let remaining chromium_code targets build with -Wextra. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_win_unittest.cc ('k') | ui/gfx/gdi_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/remote_input_method_win_unittest.cc
diff --git a/ui/base/ime/remote_input_method_win_unittest.cc b/ui/base/ime/remote_input_method_win_unittest.cc
index 0970de044ce2308ec2bd709cffe795d1b3b2c182..c2346071d64b8db80742f86a18265a3fe9f09bef 100644
--- a/ui/base/ime/remote_input_method_win_unittest.cc
+++ b/ui/base/ime/remote_input_method_win_unittest.cc
@@ -335,10 +335,10 @@ TEST(RemoteInputMethodWinTest, SetFocusedTextInputClient) {
// 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).
@@ -366,10 +366,10 @@ TEST(RemoteInputMethodWinTest, DetachTextInputClient) {
// 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
@@ -399,7 +399,7 @@ TEST(RemoteInputMethodWinTest, OnCaretBoundsChanged) {
// 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]);
@@ -414,7 +414,7 @@ TEST(RemoteInputMethodWinTest, OnCaretBoundsChanged) {
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]);
@@ -484,7 +484,7 @@ TEST(RemoteInputMethodWinTest, OnTextInputTypeChanged) {
// 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.
@@ -616,7 +616,7 @@ TEST(RemoteInputMethodWinTest, DispatchKeyEvent_FabricatedKeyDown) {
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();
@@ -632,7 +632,7 @@ TEST(RemoteInputMethodWinTest, DispatchKeyEvent_FabricatedKeyDown) {
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();
@@ -643,7 +643,7 @@ TEST(RemoteInputMethodWinTest, DispatchKeyEvent_FabricatedKeyDown) {
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();
@@ -718,7 +718,7 @@ TEST(RemoteInputMethodWinTest, OnCompositionChanged) {
// 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();
@@ -727,7 +727,7 @@ TEST(RemoteInputMethodWinTest, OnCompositionChanged) {
// 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();
}
@@ -749,8 +749,8 @@ TEST(RemoteInputMethodWinTest, OnTextCommitted) {
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();
@@ -761,8 +761,8 @@ TEST(RemoteInputMethodWinTest, OnTextCommitted) {
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();
@@ -773,7 +773,7 @@ TEST(RemoteInputMethodWinTest, OnTextCommitted) {
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();
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_win_unittest.cc ('k') | ui/gfx/gdi_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698