Now with unit test fixes. [Try 2 with fixes for unit tests.]

chrome/browser/history/history_unittest.cc

Index: chrome/browser/history/history_unittest.cc
diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc
index bd350efb2b618be9d631a5cc25135b9826c8a22a..e339004a972d55bff2a18aa7e7214e40a9faf195 100644
--- a/chrome/browser/history/history_unittest.cc
+++ b/chrome/browser/history/history_unittest.cc
@@ -937,13 +937,13 @@ TEST_F(HistoryTest, MostVisitedURLs) {
 // history" example file or it will be imported on startup, throwing off timing
 // measurements.
 //
-// See test/data/profiles/typical_history/README.txt for instructions on
-// how to up the version.
+// See test/data/profiles/profile_with_default_theme/README.txt for
+// instructions on how to up the version.
 TEST(HistoryProfileTest, TypicalProfileVersion) {
   FilePath file;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &file));
   file = file.AppendASCII("profiles");
-  file = file.AppendASCII("typical_history");
+  file = file.AppendASCII("profile_with_default_theme");
   file = file.AppendASCII("Default");
   file = file.AppendASCII("History");