| Index: chrome/installer/util/master_preferences_unittest.cc
|
| diff --git a/chrome/installer/util/master_preferences_unittest.cc b/chrome/installer/util/master_preferences_unittest.cc
|
| index de28bbdaf0db0583bf36cf9097ae24971625b54f..2aa77a2eebc97e3d9f89dbb468ab61c0214c2be1 100644
|
| --- a/chrome/installer/util/master_preferences_unittest.cc
|
| +++ b/chrome/installer/util/master_preferences_unittest.cc
|
| @@ -101,7 +101,7 @@ TEST_F(MasterPreferencesTest, ParseDistroParams) {
|
| installer::master_preferences::kAltShortcutText,
|
| };
|
|
|
| - for (int i = 0; i < arraysize(expected_true); ++i) {
|
| + for (size_t i = 0; i < arraysize(expected_true); ++i) {
|
| bool value = false;
|
| EXPECT_TRUE(prefs.GetBool(expected_true[i], &value));
|
| EXPECT_TRUE(value) << expected_true[i];
|
| @@ -152,7 +152,7 @@ TEST_F(MasterPreferencesTest, ParseMissingDistroParams) {
|
| };
|
|
|
| bool value = false;
|
| - for (int i = 0; i < arraysize(expected_bool); ++i) {
|
| + for (size_t i = 0; i < arraysize(expected_bool); ++i) {
|
| EXPECT_TRUE(prefs.GetBool(expected_bool[i].name, &value));
|
| EXPECT_EQ(value, expected_bool[i].expected_value) << expected_bool[i].name;
|
| }
|
| @@ -165,7 +165,7 @@ TEST_F(MasterPreferencesTest, ParseMissingDistroParams) {
|
| installer::master_preferences::kMakeChromeDefaultForUser,
|
| };
|
|
|
| - for (int i = 0; i < arraysize(missing_bools); ++i) {
|
| + for (size_t i = 0; i < arraysize(missing_bools); ++i) {
|
| EXPECT_FALSE(prefs.GetBool(missing_bools[i], &value)) << missing_bools[i];
|
| }
|
|
|
| @@ -204,7 +204,7 @@ TEST_F(MasterPreferencesTest, FirstRunTabs) {
|
| installer::MasterPreferences prefs(prefs_file());
|
| typedef std::vector<std::string> TabsVector;
|
| TabsVector tabs = prefs.GetFirstRunTabs();
|
| - ASSERT_EQ(3, tabs.size());
|
| + ASSERT_EQ(3u, tabs.size());
|
| EXPECT_EQ("http://google.com/f1", tabs[0]);
|
| EXPECT_EQ("https://google.com/f2", tabs[1]);
|
| EXPECT_EQ("new_tab_page", tabs[2]);
|
| @@ -277,7 +277,7 @@ TEST_F(MasterPreferencesTest, GetInstallPreferencesTest) {
|
|
|
| // Now check that prefs got merged correctly.
|
| bool value = false;
|
| - for (int i = 0; i < arraysize(expected_bool); ++i) {
|
| + for (size_t i = 0; i < arraysize(expected_bool); ++i) {
|
| EXPECT_TRUE(prefs.GetBool(expected_bool[i].name, &value));
|
| EXPECT_EQ(value, expected_bool[i].expected_value) << expected_bool[i].name;
|
| }
|
| @@ -294,7 +294,7 @@ TEST_F(MasterPreferencesTest, GetInstallPreferencesTest) {
|
| { installer::master_preferences::kDoNotLaunchChrome, true },
|
| };
|
|
|
| - for (int i = 0; i < arraysize(expected_bool2); ++i) {
|
| + for (size_t i = 0; i < arraysize(expected_bool2); ++i) {
|
| EXPECT_TRUE(prefs2.GetBool(expected_bool2[i].name, &value));
|
| EXPECT_EQ(value, expected_bool2[i].expected_value)
|
| << expected_bool2[i].name;
|
|
|