diff --git a/utils_unittest.cc b/utils_unittest.cc
index 3a4ec6a..fa97f55 100644
--- a/utils_unittest.cc
+++ b/utils_unittest.cc
@@ -96,8 +96,10 @@
                                                       true));
   EXPECT_EQ("\\\\", utils::NormalizePath("\\\\", false));
   EXPECT_EQ("\\\\", utils::NormalizePath("\\\\", true));
-  EXPECT_EQ("\\:/;$PATH\n\\", utils::NormalizePath("\\://;$PATH\n\\", false));
-  EXPECT_EQ("\\:/;$PATH\n\\", utils::NormalizePath("\\://;$PATH\n\\", true));
+  EXPECT_EQ("\\:/;$PATH\n\\",
+            utils::NormalizePath("\\://;$PATH\n\\", false));
+  EXPECT_EQ("\\:/;$PATH\n\\",
+            utils::NormalizePath("\\://;$PATH\n\\", true));
   EXPECT_EQ("/spaces s/ ok/s / / /",
             utils::NormalizePath("/spaces s/ ok/s / / /", false));
   EXPECT_EQ("/spaces s/ ok/s / / ",
@@ -212,14 +214,6 @@
   ASSERT_TRUE(utils::RecursiveUnlinkDir(temp_dir));
 }
 
-TEST(UtilsTest, TempFilenameTest) {
-  const string original = "/foo.XXXXXX";
-  const string result = utils::TempFilename(original);
-  EXPECT_EQ(original.size(), result.size());
-  EXPECT_TRUE(utils::StringHasPrefix(result, "/foo."));
-  EXPECT_FALSE(utils::StringHasSuffix(result, "XXXXXX"));
-}
-
 TEST(UtilsTest, GetDiskNameTest) {
   EXPECT_EQ("/dev/sda", utils::GetDiskName("/dev/sda3"));
   EXPECT_EQ("/dev/sdp", utils::GetDiskName("/dev/sdp1234"));
@@ -408,7 +402,7 @@
   g_main_loop_quit(loop);
   return FALSE;  // Don't call this callback again
 }
-}  // namespace {}
+}  // namespace
 
 TEST(UtilsTest, ScheduleCrashReporterUploadTest) {
   // Not much to test. At least this tests for memory leaks, crashes,
@@ -551,7 +545,7 @@
   // offset which is one hour. Conveniently, if the function were
   // someday modified to be DST aware, this test would have to be
   // modified as well.
-  const time_t dst_time = 1180940400; // Jun 4, 2007 0:00 PDT.
+  const time_t dst_time = 1180940400;  // Jun 4, 2007 0:00 PDT.
   const time_t fudge = 3600;
   int value1, value2;
   EXPECT_TRUE(utils::ConvertToOmahaInstallDate(