Re-check in some of my dynamic linking change.

We can't link in any more of these fixed .cc files because of a chain of
dependencies:
- temp_scaffolding_stubs defines the same symbols as these files
- removing the scaffolding pulls in more source
- pulling in that extra source breaks on Mac.

I have resigned myself to checking in this small bit.


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9448 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 1 deletions

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;