Recommit the generate profile patch

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 1243 matching lines @@
   MessageLoop::current()->Run();
 
   EXPECT_EQ(4U, most_visited_urls_.size());
   EXPECT_EQ(url1, most_visited_urls_[0].url);
   EXPECT_EQ(url2, most_visited_urls_[1].url);
   EXPECT_EQ(url0, most_visited_urls_[2].url);
   EXPECT_EQ(url3, most_visited_urls_[3].url);
   EXPECT_EQ(2U, most_visited_urls_[3].redirects.size());
 }
 
-// The version of the history database should be current in the "typical
-// history" example file or it will be imported on startup, throwing off timing
-// measurements.
-//
-// See test/data/profiles/profile_with_default_theme/README.txt for
-// instructions on how to up the version.
-TEST(HistoryProfileTest, TypicalProfileVersion) {
-  base::FilePath file;
-  ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &file));
-  file = file.AppendASCII("profiles");
-  file = file.AppendASCII("profile_with_default_theme");
-  file = file.AppendASCII("Default");
-  file = file.AppendASCII("History");
-
-  int cur_version = HistoryDatabase::GetCurrentVersion();
-
-  sql::Connection db;
-  ASSERT_TRUE(db.Open(file));
-
-  {
-    sql::Statement s(db.GetUniqueStatement(
-        "SELECT value FROM meta WHERE key = 'version'"));
-    EXPECT_TRUE(s.Step());
-    int file_version = s.ColumnInt(0);
-    EXPECT_EQ(cur_version, file_version);
-  }
-}
-
 namespace {
 
 // A HistoryDBTask implementation. Each time RunOnDBThread is invoked
 // invoke_count is increment. When invoked kWantInvokeCount times, true is
 // returned from RunOnDBThread which should stop RunOnDBThread from being
 // invoked again. When DoneRunOnMainThread is invoked, done_invoked is set to
 // true.
 class HistoryDBTaskImpl : public HistoryDBTask {
  public:
   static const int kWantInvokeCount;
@@ skipping 382 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