Reverting 7083,7079....

chrome/browser/bookmarks/bookmark_html_writer_unittest.cc

 // Copyright (c) 2006-2008 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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/time.h"
 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
@@ skipping 91 matching lines @@
   // Write to a temp file.
   bookmark_html_writer::WriteBookmarks(NULL, &model, path_);
 
   // Read the bookmarks back in.
   std::vector<ProfileWriter::BookmarkEntry> parsed_bookmarks;
   Firefox2Importer::ImportBookmarksFile(path_, std::set<GURL>(), false,
                                         L"x", NULL, &parsed_bookmarks, NULL,
                                         NULL);
 
   // Verify we got back what we wrote.
-  ASSERT_EQ(6U, parsed_bookmarks.size());
+  ASSERT_EQ(6, parsed_bookmarks.size());
   AssertBookmarkEntryEquals(parsed_bookmarks[0], false, url1, url1_title, t1,
                             L"Bookmark Bar", f1_title, std::wstring());
   AssertBookmarkEntryEquals(parsed_bookmarks[1], false, url2, url2_title, t2,
                             L"Bookmark Bar", f1_title, f2_title);
   AssertBookmarkEntryEquals(parsed_bookmarks[2], false, url3, url3_title, t3,
                             L"Bookmark Bar", std::wstring(), std::wstring());
   AssertBookmarkEntryEquals(parsed_bookmarks[3], false, url1, url1_title, t1,
                             std::wstring(), std::wstring(), std::wstring());
   AssertBookmarkEntryEquals(parsed_bookmarks[4], false, url2, url2_title, t2,
                             std::wstring(), std::wstring(), std::wstring());
   AssertBookmarkEntryEquals(parsed_bookmarks[5], false, url1, url1_title, t1,
                             f3_title, f4_title, std::wstring());
 }