Fix compile by using FRIEND_TEST_ALL_PREFIXES.

chrome/browser/history/top_sites.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_HISTORY_TOP_SITES_H_
 #define CHROME_BROWSER_HISTORY_TOP_SITES_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
 #include "base/lock.h"
 #include "base/timer.h"
 #include "base/ref_counted.h"
 #include "base/ref_counted_memory.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/thumbnail_score.h"
@@ skipping 72 matching lines @@
 
   // For testing with a HistoryService mock.
   void SetMockHistoryService(MockHistoryService* mhs);
 
   // Start reading thumbnails from the ThumbnailDatabase.
   void StartMigration();
 
  private:
   friend class base::RefCountedThreadSafe<TopSites>;
   friend class TopSitesTest;
-  friend class TopSitesTest_GetMostVisited_Test;
-  friend class TopSitesTest_RealDatabase_Test;
-  friend class TopSitesTest_MockDatabase_Test;
-  friend class TopSitesTest_DeleteNotifications_Test;
-  friend class TopSitesTest_GetUpdateDelay_Test;
-  friend class TopSitesTest_Migration_Test;
-  friend class TopSitesTest_QueueingRequestsForTopSites_Test;
-  friend class TopSitesTest_CancelingRequestsForTopSites_Test;
-  friend class TopSitesTest_AddTemporaryThumbnail_Test;
+  FRIEND_TEST_ALL_PREFIXES(TopSitesTest, GetMostVisited);
+  FRIEND_TEST_ALL_PREFIXES(TopSitesTest, RealDatabase);
+  FRIEND_TEST_ALL_PREFIXES(TopSitesTest, MockDatabase);
+  FRIEND_TEST_ALL_PREFIXES(TopSitesTest, DeleteNotifications);
+  FRIEND_TEST_ALL_PREFIXES(TopSitesTest, GetUpdateDelay);
+  FRIEND_TEST_ALL_PREFIXES(TopSitesTest, MigrationTest);

[gavinp, 2010/07/23 00:11:29]

FRIEND_TEST_ALL_PREFIXES(TopSitesTest, Migration);

+  FRIEND_TEST_ALL_PREFIXES(TopSitesTest, QueueingRequestsForTopSites);
+  FRIEND_TEST_ALL_PREFIXES(TopSitesTest, CancelingRequestsForTopSites);
+  FRIEND_TEST_ALL_PREFIXES(TopSitesTest, AddTemporaryThumbnail);
 
   ~TopSites();
 
   // Sets the thumbnail without writing to the database. Useful when
   // reading last known top sites from the DB.
   // Returns true if the thumbnail was set, false if the existing one is better.
   bool SetPageThumbnailNoDB(const GURL& url,
                             const RefCountedBytes* thumbnail_data,
                             const ThumbnailScore& score);
 
@@ skipping 146 matching lines @@
 
   // TODO(brettw): use the blacklist.
   // std::set<GURL> blacklist_;
 
   DISALLOW_COPY_AND_ASSIGN(TopSites);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_TOP_SITES_H_