Eliminate the archived history database and clean up related code.

chrome/browser/history/history_unittest.cc

 // Copyright (c) 2012 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.
 
 // History unit tests come in two flavors:
 //
 // 1. The more complicated style is that the unit test creates a full history
 //    service. This spawns a background thread for the history backend, and
 //    all communication is asynchronous. This is useful for testing more
 //    complicated things or end-to-end behavior.
@@ skipping 122 matching lines @@
     base::FilePath data_path;
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
     data_path = data_path.AppendASCII("History");
     data_path =
           data_path.AppendASCII(base::StringPrintf("history.%d.sql", version));
     ASSERT_NO_FATAL_FAILURE(
         ExecuteSQLScript(data_path, history_dir_.Append(
             chrome::kHistoryFilename)));
   }
 
+  void CreateArchivedDB() {
+    base::FilePath data_path;
+    ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
+    data_path = data_path.AppendASCII("History");
+    data_path = data_path.AppendASCII("archived_history.4.sql");
+    ASSERT_NO_FATAL_FAILURE(
+        ExecuteSQLScript(data_path, history_dir_.Append(
+            chrome::kArchivedHistoryFilename)));
+  }
+
   // testing::Test
   virtual void SetUp() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     history_dir_ = temp_dir_.path().AppendASCII("HistoryBackendDBTest");
     ASSERT_TRUE(base::CreateDirectory(history_dir_));
   }
 
   void DeleteBackend() {
     if (backend_.get()) {
       backend_->Closing();
@@ skipping 459 matching lines @@
     {
       sql::Statement s(db.GetUniqueStatement(
           "SELECT etag, last_modified from downloads"));
       EXPECT_TRUE(s.Step());
       EXPECT_EQ(std::string(), s.ColumnString(0));
       EXPECT_EQ(std::string(), s.ColumnString(1));
     }
   }
 }
 
+TEST_F(HistoryBackendDBTest, PurgeArchivedDatabase) {
+  ASSERT_NO_FATAL_FAILURE(CreateDBVersion(27));
+  ASSERT_NO_FATAL_FAILURE(CreateArchivedDB());
+
+  ASSERT_TRUE(base::PathExists(
+      history_dir_.Append(chrome::kArchivedHistoryFilename)));
+
+  CreateBackendAndDatabase();
+  DeleteBackend();
+
+  // We do not retain expired history entries in an archived database as of M37.
+  // Verify that any legacy archived database is deleted on start-up.
+  ASSERT_FALSE(base::PathExists(
+      history_dir_.Append(chrome::kArchivedHistoryFilename)));
+}
+
 TEST_F(HistoryBackendDBTest, ConfirmDownloadRowCreateAndDelete) {
   // Create the DB.
   CreateBackendAndDatabase();
 
   base::Time now(base::Time::Now());
 
   // Add some downloads.
   uint32 id1 = 1, id2 = 2, id3 = 3;
   AddDownload(id1, DownloadItem::COMPLETE, now);
   AddDownload(id2, DownloadItem::COMPLETE, now + base::TimeDelta::FromDays(2));
@@ skipping 1210 matching lines @@
   std::vector<PageUsageData*> results;
   db_->QuerySegmentUsage(segment_time, 10, &results);
   ASSERT_EQ(1u, results.size());
   EXPECT_EQ(url, results[0]->GetURL());
   EXPECT_EQ(segment_id, results[0]->GetID());
   EXPECT_EQ(title, results[0]->GetTitle());
   STLDeleteElements(&results);
 }
 
 }  // namespace history