summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/extensions/extension_ui_unittest.cc4
-rw-r--r--chrome/browser/net/quoted_printable_unittest.cc2
-rw-r--r--chrome/common/service_process_util_unittest.cc2
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_ui_unittest.cc b/chrome/browser/extensions/extension_ui_unittest.cc
index bee8591..e8b440d 100644
--- a/chrome/browser/extensions/extension_ui_unittest.cc
+++ b/chrome/browser/extensions/extension_ui_unittest.cc
@@ -197,8 +197,8 @@ TEST(ExtensionUITest, LocationExternalPrefPropagation) {
EXPECT_TRUE(extension_details->GetBoolean("allow_reload", &ui_allow_reload));
EXPECT_TRUE(extension_details->GetBoolean("isUnpacked", &ui_is_unpacked));
EXPECT_FALSE(extension_details->GetString("path", &ui_path));
- EXPECT_EQ(false, ui_allow_reload);
- EXPECT_EQ(false, ui_is_unpacked);
+ EXPECT_FALSE(ui_allow_reload);
+ EXPECT_FALSE(ui_is_unpacked);
}
// Test that the extension path is correctly propagated into the extension
diff --git a/chrome/browser/net/quoted_printable_unittest.cc b/chrome/browser/net/quoted_printable_unittest.cc
index 68ba18e..627e507 100644
--- a/chrome/browser/net/quoted_printable_unittest.cc
+++ b/chrome/browser/net/quoted_printable_unittest.cc
@@ -167,7 +167,7 @@ bool CompareEOLInsensitive(const std::string& s1, const std::string& s2) {
TEST(QuotedPrintableTest, Encode) {
ASSERT_EQ(arraysize(kNormalText), arraysize(kEncodedText));
for (size_t i = 0; i < arraysize(kNormalText); ++i) {
- SCOPED_TRACE(::testing::Message::Message() << "Iteration " << i);
+ SCOPED_TRACE(::testing::Message() << "Iteration " << i);
std::string output;
chrome::browser::net::QuotedPrintableEncode(kNormalText[i], &output);
std::string expected(kEncodedText[i]);
diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc
index ab55bb5..4155bda 100644
--- a/chrome/common/service_process_util_unittest.cc
+++ b/chrome/common/service_process_util_unittest.cc
@@ -125,7 +125,7 @@ TEST_F(ServiceProcessStateTest, AutoRun) {
GetServiceProcessScopedName(base_desktop_name), "Exec", &exec_value));
GError *error = NULL;
gchar **argv = NULL;
- gint argc = NULL;
+ gint argc = 0;
if (g_shell_parse_argv(exec_value.c_str(), &argc, &argv, &error)) {
autorun_command_line.reset(new CommandLine(argc, argv));
g_strfreev(argv);