Implement LoginDatabase on all platforms.

chrome/browser/password_manager/login_database_unittest.cc

 // 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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/password_manager/login_database.h"
-#if defined(OS_MACOSX)
-#include "chrome/browser/password_manager/login_database_mac.h"
-#endif
 #include "chrome/common/chrome_paths.h"
 #include "webkit/glue/password_form.h"
 
 using webkit_glue::PasswordForm;
 
 class LoginDatabaseTest : public testing::Test {
  protected:
   virtual void SetUp() {
     PathService::Get(chrome::DIR_TEST_DATA, &file_);
     const std::string test_db =
         "TestMetadataStoreMacDatabase" +
         Int64ToString(base::Time::Now().ToInternalValue()) + ".db";
     file_ = file_.AppendASCII(test_db);
     file_util::Delete(file_, false);
   }
 
   virtual void TearDown() {
     file_util::Delete(file_, false);
   }
 
   FilePath file_;
 };
 
-// Returns the correct concrete subclass for the platform. Caller is responsible
-// for delete-ing the return object.
-static LoginDatabase* CreateLoginDatabase() {
-#if defined(OS_MACOSX)
-  return new LoginDatabaseMac();
-#else
-  return NULL;
-#endif
-}
-
 TEST_F(LoginDatabaseTest, Logins) {
-  scoped_ptr<LoginDatabase> db(CreateLoginDatabase());
-  if (!db.get())
-    return;
+  scoped_ptr<LoginDatabase> db(new LoginDatabase());
 
   ASSERT_TRUE(db->Init(file_));
 
   std::vector<PasswordForm*> result;
 
   // Verify the database is empty.
   EXPECT_TRUE(db->GetAutofillableLogins(&result));
   EXPECT_EQ(0U, result.size());
 
   // Example password form.
@@ skipping 141 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(LoginDatabaseTest, ClearPrivateData_SavedPasswords) {
-  scoped_ptr<LoginDatabase> db(CreateLoginDatabase());
-  if (!db.get())
-    return;
+  scoped_ptr<LoginDatabase> db(new LoginDatabase());
 
   EXPECT_TRUE(db->Init(file_));
 
   std::vector<PasswordForm*> result;
 
   // Verify the database is empty.
   EXPECT_TRUE(db->GetAutofillableLogins(&result));
   EXPECT_EQ(0U, result.size());
 
   base::Time now = base::Time::Now();
   base::TimeDelta one_day = base::TimeDelta::FromDays(1);
 
   // Create one with a 0 time.
   EXPECT_TRUE(AddTimestampedLogin(db.get(), "1", "foo1", base::Time()));
   // Create one for now and +/- 1 day.
   EXPECT_TRUE(AddTimestampedLogin(db.get(), "2", "foo2", now - one_day));
   EXPECT_TRUE(AddTimestampedLogin(db.get(), "3", "foo3", now));
   EXPECT_TRUE(AddTimestampedLogin(db.get(), "4", "foo4", now + one_day));
 
   // Verify inserts worked.
   EXPECT_TRUE(db->GetAutofillableLogins(&result));
   EXPECT_EQ(4U, result.size());
   ClearResults(&result);
 
+  // Get everything from today's date and on.
+  EXPECT_TRUE(db->GetLoginsCreatedBetween(now, base::Time(), &result));
+  EXPECT_EQ(2U, result.size());
+  ClearResults(&result);
+
   // Delete everything from today's date and on.
   db->RemoveLoginsCreatedBetween(now, base::Time());
 
   // Should have deleted half of what we inserted.
   EXPECT_TRUE(db->GetAutofillableLogins(&result));
   EXPECT_EQ(2U, result.size());
   ClearResults(&result);
 
   // Delete with 0 date (should delete all).
   db->RemoveLoginsCreatedBetween(base::Time(), base::Time());
 
   // Verify nothing is left.
   EXPECT_TRUE(db->GetAutofillableLogins(&result));
   EXPECT_EQ(0U, result.size());
 }
 
 TEST_F(LoginDatabaseTest, BlacklistedLogins) {
-  scoped_ptr<LoginDatabase> db(CreateLoginDatabase());
-  if (!db.get())
-    return;
+  scoped_ptr<LoginDatabase> db(new LoginDatabase());
 
   EXPECT_TRUE(db->Init(file_));
   std::vector<PasswordForm*> result;
 
   // Verify the database is empty.
   EXPECT_TRUE(db->GetBlacklistLogins(&result));
   ASSERT_EQ(0U, result.size());
 
   // Save a form as blacklisted.
   PasswordForm form;
@@ skipping 16 matching lines @@
   // GetLogins should give the blacklisted result.
   EXPECT_TRUE(db->GetLogins(form, &result));
   EXPECT_EQ(1U, result.size());
   ClearResults(&result);
 
   // So should GetAllBlacklistedLogins.
   EXPECT_TRUE(db->GetBlacklistLogins(&result));
   EXPECT_EQ(1U, result.size());
   ClearResults(&result);
 }