| Index: chrome/browser/autocomplete/network_action_predictor_database_unittest.cc | 
| diff --git a/chrome/browser/autocomplete/network_action_predictor_database_unittest.cc b/chrome/browser/autocomplete/network_action_predictor_database_unittest.cc | 
| deleted file mode 100644 | 
| index 0863dc8e0888c91b2f6ac12d7cd074e13a62c1f1..0000000000000000000000000000000000000000 | 
| --- a/chrome/browser/autocomplete/network_action_predictor_database_unittest.cc | 
| +++ /dev/null | 
| @@ -1,234 +0,0 @@ | 
| -// Copyright (c) 2011 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 <vector> | 
| - | 
| -#include "base/message_loop.h" | 
| -#include "base/time.h" | 
| -#include "base/utf_string_conversions.h" | 
| -#include "chrome/browser/autocomplete/network_action_predictor_database.h" | 
| -#include "chrome/test/base/testing_profile.h" | 
| -#include "content/test/test_browser_thread.h" | 
| -#include "sql/statement.h" | 
| - | 
| -#include "testing/gtest/include/gtest/gtest.h" | 
| - | 
| -using base::Time; | 
| -using base::TimeDelta; | 
| -using content::BrowserThread; | 
| - | 
| -namespace { | 
| - | 
| -struct NetworkActionPredictorDatabase::Row test_db[] = { | 
| -  NetworkActionPredictorDatabase::Row( | 
| -      "BD85DBA2-8C29-49F9-84AE-48E1E90880DF", | 
| -      ASCIIToUTF16("goog"), GURL("http://www.google.com/"), | 
| -      1, 0), | 
| -  NetworkActionPredictorDatabase::Row( | 
| -      "BD85DBA2-8C29-49F9-84AE-48E1E90880E0", | 
| -      ASCIIToUTF16("slash"), GURL("http://slashdot.org/"), | 
| -      3, 2), | 
| -  NetworkActionPredictorDatabase::Row( | 
| -      "BD85DBA2-8C29-49F9-84AE-48E1E90880E1", | 
| -      ASCIIToUTF16("news"), GURL("http://slashdot.org/"), | 
| -      0, 1), | 
| -}; | 
| - | 
| -}  // end namespace | 
| - | 
| -class NetworkActionPredictorDatabaseTest : public testing::Test { | 
| - public: | 
| -  NetworkActionPredictorDatabaseTest(); | 
| -  virtual ~NetworkActionPredictorDatabaseTest(); | 
| - | 
| -  virtual void SetUp(); | 
| -  virtual void TearDown(); | 
| - | 
| -  size_t CountRecords() const; | 
| - | 
| -  void AddAll(); | 
| - | 
| -  bool RowsAreEqual(const NetworkActionPredictorDatabase::Row& lhs, | 
| -                    const NetworkActionPredictorDatabase::Row& rhs) const; | 
| - | 
| -  TestingProfile* profile() { return &profile_; } | 
| - | 
| - protected: | 
| - | 
| -  // Test functions that can be run against this text fixture or | 
| -  // NetworkActionPredictorDatabaseReopenTest that inherits from this. | 
| -  void TestAddRow(); | 
| -  void TestGetRow(); | 
| -  void TestUpdateRow(); | 
| -  void TestDeleteRow(); | 
| -  void TestDeleteRows(); | 
| -  void TestDeleteAllRows(); | 
| - | 
| - private: | 
| -  TestingProfile profile_; | 
| -  scoped_refptr<NetworkActionPredictorDatabase> db_; | 
| -  MessageLoop loop_; | 
| -  content::TestBrowserThread db_thread_; | 
| -}; | 
| - | 
| -class NetworkActionPredictorDatabaseReopenTest | 
| -    : public NetworkActionPredictorDatabaseTest { | 
| - public: | 
| -  virtual void SetUp() { | 
| -    // By calling SetUp twice, we make sure that the table already exists for | 
| -    // this fixture. | 
| -    NetworkActionPredictorDatabaseTest::SetUp(); | 
| -    NetworkActionPredictorDatabaseTest::TearDown(); | 
| -    NetworkActionPredictorDatabaseTest::SetUp(); | 
| -  } | 
| -}; | 
| - | 
| -NetworkActionPredictorDatabaseTest::NetworkActionPredictorDatabaseTest() | 
| -    : loop_(MessageLoop::TYPE_DEFAULT), | 
| -      db_thread_(BrowserThread::DB, &loop_) { | 
| -} | 
| - | 
| -NetworkActionPredictorDatabaseTest::~NetworkActionPredictorDatabaseTest() { | 
| -} | 
| - | 
| -void NetworkActionPredictorDatabaseTest::SetUp() { | 
| -  db_ = new NetworkActionPredictorDatabase(&profile_); | 
| -  db_->Initialize(); | 
| -} | 
| - | 
| -void NetworkActionPredictorDatabaseTest::TearDown() { | 
| -  db_ = NULL; | 
| -} | 
| - | 
| -size_t NetworkActionPredictorDatabaseTest::CountRecords() const { | 
| -  sql::Statement s(db_->db_.GetUniqueStatement( | 
| -      "SELECT count(*) FROM network_action_predictor")); | 
| -  EXPECT_TRUE(s.Step()); | 
| -  return static_cast<size_t>(s.ColumnInt(0)); | 
| -} | 
| - | 
| -void NetworkActionPredictorDatabaseTest::AddAll() { | 
| -  for (size_t i = 0; i < arraysize(test_db); ++i) | 
| -    db_->AddRow(test_db[i]); | 
| - | 
| -  EXPECT_EQ(arraysize(test_db), CountRecords()); | 
| -} | 
| - | 
| -bool NetworkActionPredictorDatabaseTest::RowsAreEqual( | 
| -    const NetworkActionPredictorDatabase::Row& lhs, | 
| -    const NetworkActionPredictorDatabase::Row& rhs) const { | 
| -  return (lhs.id == rhs.id && | 
| -          lhs.user_text == rhs.user_text && | 
| -          lhs.url == rhs.url && | 
| -          lhs.number_of_hits == rhs.number_of_hits && | 
| -          lhs.number_of_misses == rhs.number_of_misses); | 
| -} | 
| - | 
| -void NetworkActionPredictorDatabaseTest::TestAddRow() { | 
| -  EXPECT_EQ(0U, CountRecords()); | 
| -  db_->AddRow(test_db[0]); | 
| -  EXPECT_EQ(1U, CountRecords()); | 
| -  db_->AddRow(test_db[1]); | 
| -  EXPECT_EQ(2U, CountRecords()); | 
| -  db_->AddRow(test_db[2]); | 
| -  EXPECT_EQ(3U, CountRecords()); | 
| -} | 
| - | 
| -void NetworkActionPredictorDatabaseTest::TestGetRow() { | 
| -  db_->AddRow(test_db[0]); | 
| -  NetworkActionPredictorDatabase::Row row; | 
| -  db_->GetRow(test_db[0].id, &row); | 
| -  EXPECT_TRUE(RowsAreEqual(test_db[0], row)) | 
| -      << "Expected: Row with id " << test_db[0].id << "\n" | 
| -      << "Got:      Row with id " << row.id; | 
| -} | 
| - | 
| -void NetworkActionPredictorDatabaseTest::TestUpdateRow() { | 
| -  AddAll(); | 
| -  NetworkActionPredictorDatabase::Row row = test_db[1]; | 
| -  row.number_of_hits = row.number_of_hits + 1; | 
| -  db_->UpdateRow(row); | 
| - | 
| -  NetworkActionPredictorDatabase::Row updated_row; | 
| -  db_->GetRow(test_db[1].id, &updated_row); | 
| - | 
| -  EXPECT_TRUE(RowsAreEqual(row, updated_row)) | 
| -      << "Expected: Row with id " << row.id << "\n" | 
| -      << "Got:      Row with id " << updated_row.id; | 
| -} | 
| - | 
| -void NetworkActionPredictorDatabaseTest::TestDeleteRow() { | 
| -  AddAll(); | 
| -  db_->DeleteRow(test_db[2].id); | 
| -  EXPECT_EQ(arraysize(test_db) - 1, CountRecords()); | 
| -} | 
| - | 
| -void NetworkActionPredictorDatabaseTest::TestDeleteRows() { | 
| -  AddAll(); | 
| -  std::vector<NetworkActionPredictorDatabase::Row::Id> id_list; | 
| -  id_list.push_back(test_db[0].id); | 
| -  id_list.push_back(test_db[2].id); | 
| -  db_->DeleteRows(id_list); | 
| -  EXPECT_EQ(arraysize(test_db) - 2, CountRecords()); | 
| - | 
| -  NetworkActionPredictorDatabase::Row row; | 
| -  db_->GetRow(test_db[1].id, &row); | 
| -  EXPECT_TRUE(RowsAreEqual(test_db[1], row)); | 
| -} | 
| - | 
| -void NetworkActionPredictorDatabaseTest::TestDeleteAllRows() { | 
| -  AddAll(); | 
| -  db_->DeleteAllRows(); | 
| -  EXPECT_EQ(0U, CountRecords()); | 
| -} | 
| - | 
| -// NetworkActionPredictorDatabaseTest tests | 
| -TEST_F(NetworkActionPredictorDatabaseTest, AddRow) { | 
| -  TestAddRow(); | 
| -} | 
| - | 
| -TEST_F(NetworkActionPredictorDatabaseTest, GetRow) { | 
| -  TestGetRow(); | 
| -} | 
| - | 
| -TEST_F(NetworkActionPredictorDatabaseTest, UpdateRow) { | 
| -  TestUpdateRow(); | 
| -} | 
| - | 
| -TEST_F(NetworkActionPredictorDatabaseTest, DeleteRow) { | 
| -  TestDeleteRow(); | 
| -} | 
| - | 
| -TEST_F(NetworkActionPredictorDatabaseTest, DeleteRows) { | 
| -  TestDeleteRows(); | 
| -} | 
| - | 
| -TEST_F(NetworkActionPredictorDatabaseTest, DeleteAllRows) { | 
| -  TestDeleteAllRows(); | 
| -} | 
| - | 
| -// NetworkActionPredictorDatabaseReopenTest tests | 
| -TEST_F(NetworkActionPredictorDatabaseReopenTest, AddRow) { | 
| -  TestAddRow(); | 
| -} | 
| - | 
| -TEST_F(NetworkActionPredictorDatabaseReopenTest, GetRow) { | 
| -  TestGetRow(); | 
| -} | 
| - | 
| -TEST_F(NetworkActionPredictorDatabaseReopenTest, UpdateRow) { | 
| -  TestUpdateRow(); | 
| -} | 
| - | 
| -TEST_F(NetworkActionPredictorDatabaseReopenTest, DeleteRow) { | 
| -  TestDeleteRow(); | 
| -} | 
| - | 
| -TEST_F(NetworkActionPredictorDatabaseReopenTest, DeleteRows) { | 
| -  TestDeleteRows(); | 
| -} | 
| - | 
| -TEST_F(NetworkActionPredictorDatabaseReopenTest, DeleteAllRows) { | 
| -  TestDeleteAllRows(); | 
| -} | 
|  |