GTTF: some more FRIEND_TEST_ALL_PREFIXES

TEST=none
BUG=44549

Review URL: http://codereview.chromium.org/3161021

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

8 files changed, 36 insertions, 28 deletions

diff --git a/jingle/notifier/listener/send_update_task.h b/jingle/notifier/listener/send_update_task.h
index 03285dd..ea71857 100644
--- a/jingle/notifier/listener/send_update_task.h
+++ b/jingle/notifier/listener/send_update_task.h
@@ -9,10 +9,10 @@
 
 #include <string>
 
+#include "base/gtest_prod_util.h"
 #include "jingle/notifier/listener/notification_defines.h"
 #include "talk/xmllite/xmlelement.h"
 #include "talk/xmpp/xmpptask.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace notifier {
 
@@ -37,7 +37,7 @@ class SendUpdateTask : public buzz::XmppTask {
 
   OutgoingNotificationData notification_data_;
 
-  FRIEND_TEST(SendUpdateTaskTest, MakeUpdateMessage);
+  FRIEND_TEST_ALL_PREFIXES(SendUpdateTaskTest, MakeUpdateMessage);
 
   DISALLOW_COPY_AND_ASSIGN(SendUpdateTask);
 };
diff --git a/jingle/notifier/listener/subscribe_task.h b/jingle/notifier/listener/subscribe_task.h
index 5b344d9..f2888d7 100644
--- a/jingle/notifier/listener/subscribe_task.h
+++ b/jingle/notifier/listener/subscribe_task.h
@@ -12,9 +12,9 @@
 #include <string>
 #include <vector>
 
+#include "base/gtest_prod_util.h"
 #include "talk/xmllite/xmlelement.h"
 #include "talk/xmpp/xmpptask.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace notifier {
 // TODO(akalin): Remove NOTIFICATION_LEGACY and remove/refactor relevant code
@@ -41,7 +41,7 @@ class SubscribeTask : public buzz::XmppTask {
 
   std::vector<std::string> subscribed_services_list_;
 
-  FRIEND_TEST(SubscribeTaskTest, MakeSubscriptionMessage);
+  FRIEND_TEST_ALL_PREFIXES(SubscribeTaskTest, MakeSubscriptionMessage);
 
   DISALLOW_COPY_AND_ASSIGN(SubscribeTask);
 };
diff --git a/media/mf/mft_h264_decoder.h b/media/mf/mft_h264_decoder.h
index 750875a..355cb4c 100644
--- a/media/mf/mft_h264_decoder.h
+++ b/media/mf/mft_h264_decoder.h
@@ -17,8 +17,8 @@
 
 #include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 struct IDirect3DDeviceManager9;
 struct IMFTransform;
@@ -80,10 +80,11 @@ class MftH264Decoder : public base::RefCountedThreadSafe<MftH264Decoder> {
 
  private:
   friend class MftH264DecoderTest;
-  FRIEND_TEST(MftH264DecoderTest, SendDrainMessageBeforeInitDeathTest);
-  FRIEND_TEST(MftH264DecoderTest, SendDrainMessageAtInit);
-  FRIEND_TEST(MftH264DecoderTest, DrainOnEndOfInputStream);
-  FRIEND_TEST(MftH264DecoderTest, NoOutputOnGarbageInput);
+  FRIEND_TEST_ALL_PREFIXES(MftH264DecoderTest,
+                           SendDrainMessageBeforeInitDeathTest);
+  FRIEND_TEST_ALL_PREFIXES(MftH264DecoderTest, SendDrainMessageAtInit);
+  FRIEND_TEST_ALL_PREFIXES(MftH264DecoderTest, DrainOnEndOfInputStream);
+  FRIEND_TEST_ALL_PREFIXES(MftH264DecoderTest, NoOutputOnGarbageInput);
 
   bool InitComMfLibraries();
   bool InitDecoder(IDirect3DDeviceManager9* dev_manager,
diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h
index 4729b96..cea04b4 100644
--- a/remoting/client/plugin/chromoting_instance.h
+++ b/remoting/client/plugin/chromoting_instance.h
@@ -10,10 +10,10 @@
 
 #include <string>
 
+#include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
 #include "remoting/client/client_context.h"
 #include "remoting/client/host_connection.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 #include "third_party/ppapi/c/pp_event.h"
 #include "third_party/ppapi/c/pp_instance.h"
 #include "third_party/ppapi/c/pp_rect.h"
@@ -58,7 +58,7 @@ class ChromotingInstance : public pp::Instance {
   virtual bool CurrentlyOnPluginThread() const;
 
  private:
-  FRIEND_TEST(ChromotingInstanceTest, TestCaseSetup);
+  FRIEND_TEST_ALL_PREFIXES(ChromotingInstanceTest, TestCaseSetup);
 
   // Since we're an internal plugin, we can just grab the message loop during
   // init to figure out which thread we're on.  This should only be used to
diff --git a/webkit/appcache/appcache_update_job.h b/webkit/appcache/appcache_update_job.h
index d4a7d40..9d82e68 100644
--- a/webkit/appcache/appcache_update_job.h
+++ b/webkit/appcache/appcache_update_job.h
@@ -11,12 +11,12 @@
 #include <string>
 #include <vector>
 
+#include "base/gtest_prod_util.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/completion_callback.h"
 #include "net/url_request/url_request.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 #include "webkit/appcache/appcache.h"
 #include "webkit/appcache/appcache_host.h"
 #include "webkit/appcache/appcache_interfaces.h"
@@ -288,7 +288,8 @@ class AppCacheUpdateJob : public URLRequest::Delegate,
   scoped_refptr<net::CancelableCompletionCallback<AppCacheUpdateJob> >
       policy_callback_;
 
-  FRIEND_TEST(AppCacheGroupTest, QueueUpdate);
+  FRIEND_TEST_ALL_PREFIXES(AppCacheGroupTest, QueueUpdate);
+
   DISALLOW_COPY_AND_ASSIGN(AppCacheUpdateJob);
 };
 
diff --git a/webkit/appcache/mock_appcache_storage.h b/webkit/appcache/mock_appcache_storage.h
index 36a1c2e..ad6ad65 100644
--- a/webkit/appcache/mock_appcache_storage.h
+++ b/webkit/appcache/mock_appcache_storage.h
@@ -9,6 +9,7 @@
 #include <map>
 #include <vector>
 
+#include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
@@ -159,17 +160,21 @@ class MockAppCacheStorage : public AppCacheStorage {
   GURL simulated_found_manifest_url_;
   bool simulated_found_network_namespace_;
 
-  FRIEND_TEST(MockAppCacheStorageTest, BasicFindMainResponse);
-  FRIEND_TEST(MockAppCacheStorageTest, BasicFindMainFallbackResponse);
-  FRIEND_TEST(MockAppCacheStorageTest, CreateGroup);
-  FRIEND_TEST(MockAppCacheStorageTest, FindMainResponseExclusions);
-  FRIEND_TEST(MockAppCacheStorageTest, FindMainResponseWithMultipleCandidates);
-  FRIEND_TEST(MockAppCacheStorageTest, LoadCache_FarHit);
-  FRIEND_TEST(MockAppCacheStorageTest, LoadGroupAndCache_FarHit);
-  FRIEND_TEST(MockAppCacheStorageTest, MakeGroupObsolete);
-  FRIEND_TEST(MockAppCacheStorageTest, StoreNewGroup);
-  FRIEND_TEST(MockAppCacheStorageTest, StoreExistingGroup);
-  FRIEND_TEST(MockAppCacheStorageTest, StoreExistingGroupExistingCache);
+  FRIEND_TEST_ALL_PREFIXES(MockAppCacheStorageTest, BasicFindMainResponse);
+  FRIEND_TEST_ALL_PREFIXES(MockAppCacheStorageTest,
+                           BasicFindMainFallbackResponse);
+  FRIEND_TEST_ALL_PREFIXES(MockAppCacheStorageTest, CreateGroup);
+  FRIEND_TEST_ALL_PREFIXES(MockAppCacheStorageTest, FindMainResponseExclusions);
+  FRIEND_TEST_ALL_PREFIXES(MockAppCacheStorageTest,
+                           FindMainResponseWithMultipleCandidates);
+  FRIEND_TEST_ALL_PREFIXES(MockAppCacheStorageTest, LoadCache_FarHit);
+  FRIEND_TEST_ALL_PREFIXES(MockAppCacheStorageTest, LoadGroupAndCache_FarHit);
+  FRIEND_TEST_ALL_PREFIXES(MockAppCacheStorageTest, MakeGroupObsolete);
+  FRIEND_TEST_ALL_PREFIXES(MockAppCacheStorageTest, StoreNewGroup);
+  FRIEND_TEST_ALL_PREFIXES(MockAppCacheStorageTest, StoreExistingGroup);
+  FRIEND_TEST_ALL_PREFIXES(MockAppCacheStorageTest,
+                           StoreExistingGroupExistingCache);
+
   DISALLOW_COPY_AND_ASSIGN(MockAppCacheStorage);
 };
 
diff --git a/webkit/database/database_tracker.h b/webkit/database/database_tracker.h
index 55b0e12..e4c8183 100644
--- a/webkit/database/database_tracker.h
+++ b/webkit/database/database_tracker.h
@@ -9,6 +9,7 @@
 #include <set>
 
 #include "base/file_path.h"
+#include "base/gtest_prod_util.h"
 #include "base/observer_list.h"
 #include "base/platform_file.h"
 #include "base/ref_counted.h"
@@ -17,7 +18,6 @@
 #include "base/string_util.h"
 #include "base/time.h"
 #include "net/base/completion_callback.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 #include "webkit/database/database_connections.h"
 
 namespace sql {
@@ -272,7 +272,7 @@ class DatabaseTracker
   OriginDirectoriesMap incognito_origin_directories_;
   int incognito_origin_directories_generator_;
 
-  FRIEND_TEST(DatabaseTracker, TestHelper);
+  FRIEND_TEST_ALL_PREFIXES(DatabaseTracker, TestHelper);
 };
 
 }  // namespace webkit_database
diff --git a/webkit/glue/media/media_resource_loader_bridge_factory.h b/webkit/glue/media/media_resource_loader_bridge_factory.h
index 6408949..5f09235 100644
--- a/webkit/glue/media/media_resource_loader_bridge_factory.h
+++ b/webkit/glue/media/media_resource_loader_bridge_factory.h
@@ -5,7 +5,7 @@
 #ifndef WEBKIT_GLUE_MEDIA_MEDIA_RESOURCE_LOADER_BRIDGE_FACTORY_H_
 #define WEBKIT_GLUE_MEDIA_MEDIA_RESOURCE_LOADER_BRIDGE_FACTORY_H_
 
-#include "testing/gtest/include/gtest/gtest_prod.h"
+#include "base/gtest_prod_util.h"
 #include "webkit/glue/resource_loader_bridge.h"
 
 namespace webkit_glue {
@@ -44,7 +44,8 @@ class MediaResourceLoaderBridgeFactory {
   }
 
  private:
-  FRIEND_TEST(MediaResourceLoaderBridgeFactoryTest, GenerateHeaders);
+  FRIEND_TEST_ALL_PREFIXES(MediaResourceLoaderBridgeFactoryTest,
+                           GenerateHeaders);
 
   // Returns a range request header using parameters |first_byte_position| and
   // |last_byte_position|.