Convert the sqlite cookie database and web database to use the new sqlite...

chrome/browser/webdata/web_database_unittest.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 68 matching lines @@
   static void set_prepopulate_id(TemplateURL* url, int id) {
     url->set_prepopulate_id(id);
   }
 
   FilePath file_;
 };
 
 TEST_F(WebDatabaseTest, Keywords) {
   WebDatabase db;
 
-  EXPECT_TRUE(db.Init(file_.ToWStringHack()));
+  EXPECT_TRUE(db.Init(file_));
 
   TemplateURL template_url;
   template_url.set_short_name(L"short_name");
   template_url.set_keyword(L"keyword");
   GURL favicon_url("http://favicon.url/");
   GURL originating_url("http://google.com/");
   template_url.SetFavIconURL(favicon_url);
   template_url.SetURL(L"http://url/", 0, 0);
   template_url.set_safe_for_autoreplace(true);
   template_url.set_show_in_default_list(true);
@@ skipping 40 matching lines @@
   EXPECT_TRUE(db.GetKeywords(&template_urls));
 
   EXPECT_EQ(0U, template_urls.size());
 
   delete restored_url;
 }
 
 TEST_F(WebDatabaseTest, KeywordMisc) {
   WebDatabase db;
 
-  EXPECT_TRUE(db.Init(file_.ToWStringHack()));
+  EXPECT_TRUE(db.Init(file_));
 
   ASSERT_EQ(0, db.GetDefaulSearchProviderID());
   ASSERT_EQ(0, db.GetBuitinKeywordVersion());
 
   db.SetDefaultSearchProviderID(10);
   db.SetBuitinKeywordVersion(11);
 
   ASSERT_EQ(10, db.GetDefaulSearchProviderID());
   ASSERT_EQ(11, db.GetBuitinKeywordVersion());
 }
 
 TEST_F(WebDatabaseTest, UpdateKeyword) {
   WebDatabase db;
 
-  EXPECT_TRUE(db.Init(file_.ToWStringHack()));
+  EXPECT_TRUE(db.Init(file_));
 
   TemplateURL template_url;
   template_url.set_short_name(L"short_name");
   template_url.set_keyword(L"keyword");
   GURL favicon_url("http://favicon.url/");
   GURL originating_url("http://originating.url/");
   template_url.SetFavIconURL(favicon_url);
   template_url.SetURL(L"http://url/", 0, 0);
   template_url.set_safe_for_autoreplace(true);
   template_url.set_show_in_default_list(true);
@@ skipping 41 matching lines @@
   EXPECT_EQ(template_url.id(), restored_url->id());
 
   EXPECT_EQ(template_url.prepopulate_id(), restored_url->prepopulate_id());
 
   delete restored_url;
 }
 
 TEST_F(WebDatabaseTest, KeywordWithNoFavicon) {
   WebDatabase db;
 
-  EXPECT_TRUE(db.Init(file_.ToWStringHack()));
+  EXPECT_TRUE(db.Init(file_));
 
   TemplateURL template_url;
   template_url.set_short_name(L"short_name");
   template_url.set_keyword(L"keyword");
   template_url.SetURL(L"http://url/", 0, 0);
   template_url.set_safe_for_autoreplace(true);
   SetID(-100, &template_url);
 
   EXPECT_TRUE(db.AddKeyword(template_url));
 
   std::vector<TemplateURL*> template_urls;
   EXPECT_TRUE(db.GetKeywords(&template_urls));
   EXPECT_EQ(1U, template_urls.size());
   const TemplateURL* restored_url = template_urls.front();
 
   EXPECT_EQ(template_url.short_name(), restored_url->short_name());
   EXPECT_EQ(template_url.keyword(), restored_url->keyword());
   EXPECT_TRUE(!restored_url->GetFavIconURL().is_valid());
   EXPECT_TRUE(restored_url->safe_for_autoreplace());
   EXPECT_EQ(GetID(&template_url), GetID(restored_url));
   delete restored_url;
 }
 
 TEST_F(WebDatabaseTest, Logins) {
   WebDatabase db;
 
-  EXPECT_TRUE(db.Init(file_.ToWStringHack()));
+  EXPECT_TRUE(db.Init(file_));
 
   std::vector<PasswordForm*> result;
 
   // Verify the database is empty.
   EXPECT_TRUE(db.GetAllLogins(&result, true));
   EXPECT_EQ(0U, result.size());
 
   // Example password form.
   PasswordForm form;
   form.origin = GURL("http://www.google.com/accounts/LoginAuth");
@@ skipping 112 matching lines @@
 
   // Make sure everything can disappear.
   EXPECT_TRUE(db.RemoveLogin(form4));
   EXPECT_TRUE(db.GetAllLogins(&result, true));
   EXPECT_EQ(0U, result.size());
 }
 
 TEST_F(WebDatabaseTest, Autofill) {
   WebDatabase db;
 
-  EXPECT_TRUE(db.Init(file_.ToWStringHack()));
+  EXPECT_TRUE(db.Init(file_));
 
   Time t1 = Time::Now();
 
   // Simulate the submission of a handful of entries in a field called "Name",
   // some more often than others.
   EXPECT_TRUE(db.AddAutofillFormElement(
       AutofillForm::Element(L"Name", L"Superman")));
   std::vector<std::wstring> v;
   for (int i = 0; i < 5; i++) {
     EXPECT_TRUE(db.AddAutofillFormElement(
@@ skipping 111 matching lines @@
 static void ClearResults(std::vector<PasswordForm*>* results) {
   for (size_t i = 0; i < results->size(); ++i) {
     delete (*results)[i];
   }
   results->clear();
 }
 
 TEST_F(WebDatabaseTest, ClearPrivateData_SavedPasswords) {
   WebDatabase db;
 
-  EXPECT_TRUE(db.Init(file_.ToWStringHack()));
+  EXPECT_TRUE(db.Init(file_));
 
   std::vector<PasswordForm*> result;
 
   // Verify the database is empty.
   EXPECT_TRUE(db.GetAllLogins(&result, true));
   EXPECT_EQ(0U, result.size());
 
   Time now = Time::Now();
   TimeDelta one_day = TimeDelta::FromDays(1);
 
@@ skipping 21 matching lines @@
   db.RemoveLoginsCreatedBetween(Time(), Time());
 
   // Verify nothing is left.
   EXPECT_TRUE(db.GetAllLogins(&result, true));
   EXPECT_EQ(0U, result.size());
 }
 
 TEST_F(WebDatabaseTest, BlacklistedLogins) {
   WebDatabase db;
 
-  EXPECT_TRUE(db.Init(file_.ToWStringHack()));
+  EXPECT_TRUE(db.Init(file_));
   std::vector<PasswordForm*> result;
 
   // Verify the database is empty.
   EXPECT_TRUE(db.GetAllLogins(&result, true));
   ASSERT_EQ(0U, result.size());
 
   // Save a form as blacklisted.
   PasswordForm form;
   form.origin = GURL("http://www.google.com/accounts/LoginAuth");
   form.action = GURL("http://www.google.com/accounts/Login");
@@ skipping 18 matching lines @@
 
   // So should GetAll including blacklisted.
   EXPECT_TRUE(db.GetAllLogins(&result, true));
   EXPECT_EQ(1U, result.size());
   ClearResults(&result);
 }
 
 TEST_F(WebDatabaseTest, WebAppHasAllImages) {
   WebDatabase db;
 
-  EXPECT_TRUE(db.Init(file_.ToWStringHack()));
+  EXPECT_TRUE(db.Init(file_));
   GURL url("http://google.com/");
 
   // Initial value for unknown web app should be false.
   EXPECT_FALSE(db.GetWebAppHasAllImages(url));
 
   // Set the value and make sure it took.
   EXPECT_TRUE(db.SetWebAppHasAllImages(url, true));
   EXPECT_TRUE(db.GetWebAppHasAllImages(url));
 
   // Remove the app and make sure value reverts to default.
   EXPECT_TRUE(db.RemoveWebApp(url));
   EXPECT_FALSE(db.GetWebAppHasAllImages(url));
 }
 
 TEST_F(WebDatabaseTest, WebAppImages) {
   WebDatabase db;
 
-  ASSERT_TRUE(db.Init(file_.ToWStringHack()));
+  ASSERT_TRUE(db.Init(file_));
   GURL url("http://google.com/");
 
   // Web app should initially have no images.
   std::vector<SkBitmap> images;
   ASSERT_TRUE(db.GetWebAppImages(url, &images));
   ASSERT_EQ(0U, images.size());
 
   // Add an image.
   SkBitmap image;
   image.setConfig(SkBitmap::kARGB_8888_Config, 16, 16);
@@ skipping 49 matching lines @@
     ASSERT_EQ(16, images[0].height());
     ASSERT_EQ(32, images[1].width());
     ASSERT_EQ(32, images[1].height());
   } else {
     ASSERT_EQ(32, images[0].width());
     ASSERT_EQ(32, images[0].height());
     ASSERT_EQ(16, images[1].width());
     ASSERT_EQ(16, images[1].height());
   }
 }