4 files changed, 10 insertions, 3 deletions
diff --git a/chrome/browser/history/expire_history_backend.h b/chrome/browser/history/expire_history_backend.h
index 0e5ab44..ed44096 100644
--- a/chrome/browser/history/expire_history_backend.h
+++ b/chrome/browser/history/expire_history_backend.h
@@ -18,6 +18,7 @@
 class BookmarkService;
 class GURL;
 class NotificationType;
+class TestingProfile;
 
 namespace history {
 
@@ -85,7 +86,7 @@ class ExpireHistoryBackend {
   FRIEND_TEST(ExpireHistoryTest, DeleteTextIndexForURL);
   FRIEND_TEST(ExpireHistoryTest, DeleteFaviconsIfPossible);
   FRIEND_TEST(ExpireHistoryTest, ArchiveSomeOldHistory);
-  friend class TestingProfile;
+  friend class ::TestingProfile;
 
   struct DeleteDependencies {
     // The time range affected. These can be is_null() to be unbounded in one
diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc
index 0bfcd6fa..74118d0 100644
--- a/chrome/browser/history/history.cc
+++ b/chrome/browser/history/history.cc
@@ -599,6 +599,7 @@ void HistoryService::SetInMemoryBackend(
 }
 
 void HistoryService::NotifyTooNew() {
+#if defined(OS_WIN)
   // Find the last browser window to display our message box from.
   Browser* cur_browser = BrowserList::GetLastActive();
   // TODO(brettw): Do this some other way or beng will kick you. e.g. move to
@@ -611,6 +612,10 @@ void HistoryService::NotifyTooNew() {
   std::wstring message = l10n_util::GetString(IDS_PROFILE_TOO_NEW_ERROR);
   MessageBox(cur_hwnd, message.c_str(), title.c_str(),
              MB_OK | MB_ICONWARNING | MB_TOPMOST);
+#else
+  // TODO(port): factor this out into platform-specific code.
+  NOTIMPLEMENTED();
+#endif
 }
 
 void HistoryService::DeleteURL(const GURL& url) {
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc
index c899700..6bed37a 100644
--- a/chrome/browser/history/history_backend.cc
+++ b/chrome/browser/history/history_backend.cc
@@ -477,7 +477,7 @@ void HistoryBackend::InitImpl() {
   std::wstring archived_name = GetArchivedFileName();
   std::wstring tmp_bookmarks_file = history_dir_;
   file_util::AppendToPath(&tmp_bookmarks_file,
-                          chrome::kHistoryBookmarksFileName);
+      FilePath(chrome::kHistoryBookmarksFileName).ToWStringHack());
 
   // History database.
   db_.reset(new HistoryDatabase());
diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h
index 8918742..1dfa16e 100644
--- a/chrome/browser/history/history_backend.h
+++ b/chrome/browser/history/history_backend.h
@@ -26,6 +26,7 @@
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 class BookmarkService;
+class TestingProfile;
 struct ThumbnailScore;
 
 namespace history {
@@ -260,7 +261,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
   friend class HistoryTest;  // So the unit tests can poke our innards.
   FRIEND_TEST(HistoryBackendTest, DeleteAll);
   FRIEND_TEST(HistoryBackendTest, URLsNoLongerBookmarked);
-  friend class TestingProfile;
+  friend class ::TestingProfile;
 
   // Computes the name of the specified database on disk.
   std::wstring GetThumbnailFileName() const;