Port some things in browser/{download,history}, minor things in common....

chrome/browser/history/text_database_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 "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/browser/history/text_database.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 184 matching lines @@
   options.begin_time = Time::FromInternalValue(0);
 
   std::vector<TextDatabase::Match> results;
   Time first_time_searched;
   TextDatabase::URLSet unique_urls;
   db->GetTextMatches("COUNTTAG", options, &results, &unique_urls,
                      &first_time_searched);
   EXPECT_TRUE(unique_urls.empty()) << "Didn't ask for unique URLs";
 
   // All 3 sites should be returned in order.
-  ASSERT_EQ(3, results.size());
+  ASSERT_EQ(3U, results.size());
   EXPECT_EQ(GURL(kURL1), results[2].url);
   EXPECT_EQ(GURL(kURL2), results[1].url);
   EXPECT_EQ(GURL(kURL3), results[0].url);
 
   // Verify the info on those results.
   EXPECT_TRUE(Time::FromInternalValue(kTime1) == results[2].time);
   EXPECT_TRUE(Time::FromInternalValue(kTime2) == results[1].time);
   EXPECT_TRUE(Time::FromInternalValue(kTime3) == results[0].time);
 
   EXPECT_EQ(UTF8ToWide(std::string(kTitle1)), results[2].title);
   EXPECT_EQ(UTF8ToWide(std::string(kTitle2)), results[1].title);
   EXPECT_EQ(UTF8ToWide(std::string(kTitle3)), results[0].title);
 
   // Should have no matches in the title.
-  EXPECT_EQ(0, results[0].title_match_positions.size());
-  EXPECT_EQ(0, results[1].title_match_positions.size());
-  EXPECT_EQ(0, results[2].title_match_positions.size());
+  EXPECT_EQ(0U, results[0].title_match_positions.size());
+  EXPECT_EQ(0U, results[1].title_match_positions.size());
+  EXPECT_EQ(0U, results[2].title_match_positions.size());
 
   // We don't want to be dependent on the exact snippet algorithm, but we know
   // since we searched for "COUNTTAG" which occurs at the beginning of each
   // document, that each snippet should start with that.
   EXPECT_TRUE(StartsWithASCII(WideToUTF8(results[0].snippet.text()),
                               "COUNTTAG", false));
   EXPECT_TRUE(StartsWithASCII(WideToUTF8(results[1].snippet.text()),
                               "COUNTTAG", false));
   EXPECT_TRUE(StartsWithASCII(WideToUTF8(results[2].snippet.text()),
                               "COUNTTAG", false));
@@ skipping 13 matching lines @@
   options.end_time = Time::FromInternalValue(kTime3);
 
   std::vector<TextDatabase::Match> results;
   Time first_time_searched;
   TextDatabase::URLSet unique_urls;
   db->GetTextMatches("COUNTTAG", options, &results,  &unique_urls,
                      &first_time_searched);
   EXPECT_TRUE(unique_urls.empty()) << "Didn't ask for unique URLs";
 
   // The first and second should have been returned.
-  EXPECT_EQ(2, results.size());
+  EXPECT_EQ(2U, results.size());
   EXPECT_TRUE(ResultsHaveURL(results, kURL1));
   EXPECT_TRUE(ResultsHaveURL(results, kURL2));
   EXPECT_FALSE(ResultsHaveURL(results, kURL3));
   EXPECT_EQ(kTime1, first_time_searched.ToInternalValue());
 
   // ---------------------------------------------------------------------------
   // Do a query where there isn't a result on the begin boundary, so we can
   // test that the first time searched is set to the minimum time considered
   // instead of the min value.
   options.begin_time = Time::FromInternalValue((kTime2 - kTime1) / 2 + kTime1);
   options.end_time = Time::FromInternalValue(kTime3 + 1);
   results.clear();  // GetTextMatches does *not* clear the results.
   db->GetTextMatches("COUNTTAG", options, &results, &unique_urls,
                      &first_time_searched);
   EXPECT_TRUE(unique_urls.empty()) << "Didn't ask for unique URLs";
   EXPECT_EQ(options.begin_time.ToInternalValue(),
             first_time_searched.ToInternalValue());
 
   // Should have two results, the second and third.
-  EXPECT_EQ(2, results.size());
+  EXPECT_EQ(2U, results.size());
   EXPECT_FALSE(ResultsHaveURL(results, kURL1));
   EXPECT_TRUE(ResultsHaveURL(results, kURL2));
   EXPECT_TRUE(ResultsHaveURL(results, kURL3));
 
   // No results should also set the first_time_searched.
   options.begin_time = Time::FromInternalValue(kTime3 + 1);
   options.end_time = Time::FromInternalValue(kTime3 * 100);
   results.clear();
   db->GetTextMatches("COUNTTAG", options, &results, &unique_urls,
                      &first_time_searched);
@@ skipping 17 matching lines @@
   options.max_count = 1;
 
   std::vector<TextDatabase::Match> results;
   Time first_time_searched;
   TextDatabase::URLSet unique_urls;
   db->GetTextMatches("google", options, &results, &unique_urls,
                      &first_time_searched);
   EXPECT_TRUE(unique_urls.empty()) << "Didn't ask for unique URLs";
 
   // There should be one result, the most recent one.
-  EXPECT_EQ(1, results.size());
+  EXPECT_EQ(1U, results.size());
   EXPECT_TRUE(ResultsHaveURL(results, kURL2));
 
   // The max time considered should be the date of the returned item.
   EXPECT_EQ(kTime2, first_time_searched.ToInternalValue());
 }
 
 }  // namespace history