Porting in browser/webdata and template_url.

chrome/browser/template_url_model_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 <windows.h>
-
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/template_url.h"
 #include "chrome/browser/template_url_model.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/test/testing_profile.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 22 matching lines @@
  public:
   TemplateURLModelTestingProfile() : TestingProfile() { }
 
   void SetUp() {
     // Name a subdirectory of the temp directory.
     ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_dir_));
     file_util::AppendToPath(&test_dir_, L"TemplateURLModelTest");
 
     // Create a fresh, empty copy of this directory.
     file_util::Delete(test_dir_, true);
-    CreateDirectory(test_dir_.c_str(), NULL);
+    file_util::CreateDirectory(test_dir_);
 
     std::wstring path = test_dir_;
     file_util::AppendToPath(&path, L"TestDataService.db");
     service_ = new WebDataService;
     EXPECT_TRUE(service_->InitWithPath(path));
   }
 
   void TearDown() {
     // Clean up the test directory.
     service_->Shutdown();
@@ skipping 223 matching lines @@
   ASSERT_EQ(L"blah", TemplateURLModel::GenerateKeyword(GURL("http://blah/"),
                                                        true));
 }
 
 TEST_F(TemplateURLModelTest, ClearBrowsingData_Keywords) {
   Time now = Time::Now();
   TimeDelta one_day = TimeDelta::FromDays(1);
   Time month_ago = now - TimeDelta::FromDays(30);
 
   // Nothing has been added.
-  EXPECT_EQ(0, model_->GetTemplateURLs().size());
+  EXPECT_EQ(0U, model_->GetTemplateURLs().size());
 
   // Create one with a 0 time.
   AddKeywordWithDate(L"key1", false, L"http://foo1", L"name1", true, Time());
   // Create one for now and +/- 1 day.
   AddKeywordWithDate(L"key2", false, L"http://foo2", L"name2", true,
                      now - one_day);
   AddKeywordWithDate(L"key3", false, L"http://foo3", L"name3", true, now);
   AddKeywordWithDate(L"key4", false, L"http://foo4", L"name4", true,
                      now + one_day);
   // Try the other three states.
   AddKeywordWithDate(L"key5", false, L"http://foo5", L"name5", false, now);
   AddKeywordWithDate(L"key6", false, L"http://foo6", L"name6", false, month_ago);
 
   // We just added a few items, validate them.
-  EXPECT_EQ(6, model_->GetTemplateURLs().size());
+  EXPECT_EQ(6U, model_->GetTemplateURLs().size());
 
   // Try removing from current timestamp. This should delete the one in the
   // future and one very recent one.
   model_->RemoveAutoGeneratedSince(now);
-  EXPECT_EQ(4, model_->GetTemplateURLs().size());
+  EXPECT_EQ(4U, model_->GetTemplateURLs().size());
 
   // Try removing from two months ago. This should only delete items that are
   // auto-generated.
   model_->RemoveAutoGeneratedSince(now - TimeDelta::FromDays(60));
-  EXPECT_EQ(3, model_->GetTemplateURLs().size());
+  EXPECT_EQ(3U, model_->GetTemplateURLs().size());
 
   // Make sure the right values remain.
   EXPECT_EQ(L"key1", model_->GetTemplateURLs()[0]->keyword());
   EXPECT_TRUE(model_->GetTemplateURLs()[0]->safe_for_autoreplace());
-  EXPECT_EQ(0, model_->GetTemplateURLs()[0]->date_created().ToInternalValue());
+  EXPECT_EQ(0U, model_->GetTemplateURLs()[0]->date_created().ToInternalValue());
 
   EXPECT_EQ(L"key5", model_->GetTemplateURLs()[1]->keyword());
   EXPECT_FALSE(model_->GetTemplateURLs()[1]->safe_for_autoreplace());
   EXPECT_EQ(now.ToInternalValue(),
             model_->GetTemplateURLs()[1]->date_created().ToInternalValue());
 
   EXPECT_EQ(L"key6", model_->GetTemplateURLs()[2]->keyword());
   EXPECT_FALSE(model_->GetTemplateURLs()[2]->safe_for_autoreplace());
   EXPECT_EQ(month_ago.ToInternalValue(),
             model_->GetTemplateURLs()[2]->date_created().ToInternalValue());
 
   // Try removing from Time=0. This should delete one more.
   model_->RemoveAutoGeneratedSince(Time());
-  EXPECT_EQ(2, model_->GetTemplateURLs().size());
+  EXPECT_EQ(2U, model_->GetTemplateURLs().size());
 }
 
 TEST_F(TemplateURLModelTest, Reset) {
   // Add a new TemplateURL.
   VerifyLoad();
   const size_t initial_count = model_->GetTemplateURLs().size();
   TemplateURL* t_url = new TemplateURL();
   t_url->SetURL(L"http://www.google.com/foo/bar", 0, 0);
   t_url->set_keyword(L"keyword");
   t_url->set_short_name(L"google");
@@ skipping 191 matching lines @@
     // Query with key occurring multiple times should return false.
     { "http://blah/foo?x=y&x=z", false, "", "" },
 
     { "http://blah/foo?x=y", true, "x", "y" },
     { "http://blah/foo?x=y&y=z", true, "x;y", "y;z" },
 
     // Key occurring multiple times should get an empty string.
     { "http://blah/foo?x=y&x=z&y=z", true, "x;y", ";z" },
   };
 
-  for (size_t i = 0; i < arraysize(data); ++i) {
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
     TemplateURLModel::QueryTerms terms;
     ASSERT_EQ(data[i].result,
               TemplateURLModel::BuildQueryTerms(GURL(data[i].url), &terms));
     if (data[i].result) {
       std::vector<std::string> keys;
       std::vector<std::string> values;
       SplitString(data[i].keys, ';', &keys);
       SplitString(data[i].values, ';', &values);
       ASSERT_TRUE(keys.size() == values.size());
       ASSERT_EQ(keys.size(), terms.size());
@@ skipping 17 matching lines @@
     { "http://x/bar?q=xx", L"" },
     { "http://x/foo?y=xx", L"" },
     { "http://x/foo?q=xx", L"xx" },
     { "http://x/foo?a=b&q=xx", L"xx" },
     { "http://x/foo?q=b&q=xx", L"" },
   };
 
   AddKeywordWithDate(L"x", false, L"http://x/foo?q={searchTerms}", L"name",
                      false, Time());
 
-  for (size_t i = 0; i < arraysize(data); ++i) {
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
     model_->UpdateKeywordSearchTermsForURL(history::URLRow(GURL(data[i].url)));
     EXPECT_EQ(data[i].term, GetAndClearSearchTerm());
   }
 }
 
 TEST_F(TemplateURLModelTest, DontUpdateKeywordSearchForNonReplaceable) {
   struct TestData {
     const std::string url;
   } data[] = {
     { "http://foo/" },
     { "http://x/bar?q=xx" },
     { "http://x/foo?y=xx" },
   };
 
   AddKeywordWithDate(L"x", false, L"http://x/foo", L"name", false, Time());
 
-  for (size_t i = 0; i < arraysize(data); ++i) {
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
     model_->UpdateKeywordSearchTermsForURL(history::URLRow(GURL(data[i].url)));
     ASSERT_EQ(std::wstring(), GetAndClearSearchTerm());
   }
 }
 
 TEST_F(TemplateURLModelTest, ChangeGoogleBaseValue) {
   // NOTE: Do not do a VerifyLoad() here as it will load the prepopulate data,
   // which also has a {google:baseURL} keyword in it, which will confuse this
   // test.
   SetGoogleBaseURL(L"http://google.com/");
@@ skipping 11 matching lines @@
   VerifyObserverCount(1);
 
   // Make sure the host->TemplateURL map was updated appropriately.
   ASSERT_EQ(t_url, model_->GetTemplateURLForHost("foo.com"));
   EXPECT_TRUE(model_->GetTemplateURLForHost("google.com") == NULL);
   EXPECT_EQ("foo.com", t_url->url()->GetHost());
   EXPECT_EQ(L"foo.com", t_url->keyword());
   EXPECT_EQ("http://foo.com/?q=x", t_url->url()->ReplaceSearchTerms(*t_url,
       L"x", TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring()).spec());
 }