GTTF: Use FRIEND_TEST_ALL_PREFIXES some more.

TEST=compile
BUG=44549

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

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

11 files changed, 47 insertions, 44 deletions

diff --git a/chrome/browser/background_contents_service.h b/chrome/browser/background_contents_service.h
index 73d9944..ede8cdb 100644
--- a/chrome/browser/background_contents_service.h
+++ b/chrome/browser/background_contents_service.h
@@ -7,10 +7,10 @@
 
 #include <map>
 
+#include "base/gtest_prod_util.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 class BackgroundContents;
 class CommandLine;
@@ -39,8 +39,10 @@ class BackgroundContentsService : private NotificationObserver {
 
  private:
   friend class BackgroundContentsServiceTest;
-  FRIEND_TEST(BackgroundContentsServiceTest, BackgroundContentsCreateDestroy);
-  FRIEND_TEST(BackgroundContentsServiceTest, TestApplicationIDLinkage);
+  FRIEND_TEST_ALL_PREFIXES(BackgroundContentsServiceTest,
+                           BackgroundContentsCreateDestroy);
+  FRIEND_TEST_ALL_PREFIXES(BackgroundContentsServiceTest,
+                           TestApplicationIDLinkage);
 
   // Registers for various notifications.
   void StartObserving(Profile* profile);
diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h
index 6d4e4d2..548e9ff 100644
--- a/chrome/browser/metrics/metrics_service.h
+++ b/chrome/browser/metrics/metrics_service.h
@@ -488,13 +488,13 @@ class MetricsService : public NotificationObserver,
   scoped_refptr<chromeos::ExternalMetrics> external_metrics_;
 #endif
 
-  FRIEND_TEST(MetricsServiceTest, EmptyLogList);
-  FRIEND_TEST(MetricsServiceTest, SingleElementLogList);
-  FRIEND_TEST(MetricsServiceTest, OverLimitLogList);
-  FRIEND_TEST(MetricsServiceTest, SmallRecoveredListSize);
-  FRIEND_TEST(MetricsServiceTest, RemoveSizeFromLogList);
-  FRIEND_TEST(MetricsServiceTest, CorruptSizeOfLogList);
-  FRIEND_TEST(MetricsServiceTest, CorruptChecksumOfLogList);
+  FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, EmptyLogList);
+  FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, SingleElementLogList);
+  FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, OverLimitLogList);
+  FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, SmallRecoveredListSize);
+  FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, RemoveSizeFromLogList);
+  FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, CorruptSizeOfLogList);
+  FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, CorruptChecksumOfLogList);
   FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, ClientIdGeneratesAllZeroes);
   FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, ClientIdGeneratesCorrectly);
   FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, ClientIdCorrectlyFormatted);
diff --git a/chrome/browser/renderer_host/gtk_im_context_wrapper.h b/chrome/browser/renderer_host/gtk_im_context_wrapper.h
index c33c290..27719b4 100644
--- a/chrome/browser/renderer_host/gtk_im_context_wrapper.h
+++ b/chrome/browser/renderer_host/gtk_im_context_wrapper.h
@@ -10,8 +10,8 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
 #include "base/string16.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCompositionUnderline.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebTextInputType.h"
 
@@ -58,7 +58,7 @@ class GtkIMContextWrapper {
  private:
   // For unit tests.
   class GtkIMContextWrapperTest;
-  FRIEND_TEST(GtkIMContextWrapperTest, ExtractCompositionInfo);
+  FRIEND_TEST_ALL_PREFIXES(GtkIMContextWrapperTest, ExtractCompositionInfo);
 
   // Check if a text needs commit by forwarding a char event instead of
   // by confirming as a composition text.
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 539b104..2d3018b 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "base/file_path.h"
+#include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
 #include "base/values.h"
 #include "base/version.h"
@@ -19,7 +20,6 @@
 #include "chrome/common/extensions/url_pattern.h"
 #include "gfx/size.h"
 #include "googleurl/src/gurl.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 class ExtensionAction;
 class ExtensionResource;
@@ -577,8 +577,8 @@ class Extension {
   // True while the extension is being upgraded.
   bool being_upgraded_;
 
-  FRIEND_TEST(ExtensionTest, LoadPageActionHelper);
-  FRIEND_TEST(TabStripModelTest, Apps);
+  FRIEND_TEST_ALL_PREFIXES(ExtensionTest, LoadPageActionHelper);
+  FRIEND_TEST_ALL_PREFIXES(TabStripModelTest, Apps);
 
   DISALLOW_COPY_AND_ASSIGN(Extension);
 };
diff --git a/chrome/common/net/gaia/gaia_authenticator.h b/chrome/common/net/gaia/gaia_authenticator.h
index d34af2d..89ab8e9 100644
--- a/chrome/common/net/gaia/gaia_authenticator.h
+++ b/chrome/common/net/gaia/gaia_authenticator.h
@@ -31,10 +31,10 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
 #include "base/message_loop.h"
 #include "chrome/common/deprecated/event_sys.h"
 #include "googleurl/src/gurl.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"  // For FRIEND_TEST
 
 namespace gaia {
 
@@ -80,7 +80,8 @@ struct GaiaAuthEvent {
 // GaiaAuthenticator can be used to pass user credentials to Gaia and obtain
 // cookies set by the Gaia servers.
 class GaiaAuthenticator {
-  FRIEND_TEST(GaiaAuthenticatorTest, TestNewlineAtEndOfAuthTokenRemoved);
+  FRIEND_TEST_ALL_PREFIXES(GaiaAuthenticatorTest,
+                           TestNewlineAtEndOfAuthTokenRemoved);
  public:
 
   // Since GaiaAuthenticator can be used for any service, or by any client, you
diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h
index 1be2f13..1280fc8 100644
--- a/chrome/installer/util/google_chrome_distribution.h
+++ b/chrome/installer/util/google_chrome_distribution.h
@@ -8,11 +8,10 @@
 #ifndef CHROME_INSTALLER_UTIL_GOOGLE_CHROME_DISTRIBUTION_H_
 #define CHROME_INSTALLER_UTIL_GOOGLE_CHROME_DISTRIBUTION_H_
 
+#include "base/gtest_prod_util.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/util_constants.h"
 
-#include "testing/gtest/include/gtest/gtest_prod.h"  // for FRIEND_TEST
-
 class DictionaryValue;
 
 class GoogleChromeDistribution : public BrowserDistribution {
@@ -88,7 +87,7 @@ class GoogleChromeDistribution : public BrowserDistribution {
  private:
   friend class BrowserDistribution;
 
-  FRIEND_TEST(GoogleChromeDistTest, TestExtractUninstallMetrics);
+  FRIEND_TEST_ALL_PREFIXES(GoogleChromeDistTest, TestExtractUninstallMetrics);
 
   // Extracts uninstall metrics from the JSON file located at file_path.
   // Returns them in a form suitable for appending to a url that already
diff --git a/chrome/renderer/audio_message_filter.h b/chrome/renderer/audio_message_filter.h
index 6b4f736..3fcedf2c 100644
--- a/chrome/renderer/audio_message_filter.h
+++ b/chrome/renderer/audio_message_filter.h
@@ -10,12 +10,12 @@
 #ifndef CHROME_RENDERER_AUDIO_MESSAGE_FILTER_H_
 #define CHROME_RENDERER_AUDIO_MESSAGE_FILTER_H_
 
+#include "base/gtest_prod_util.h"
 #include "base/id_map.h"
 #include "base/shared_memory.h"
 #include "base/sync_socket.h"
 #include "base/time.h"
 #include "ipc/ipc_channel_proxy.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 struct ViewMsg_AudioStreamState_Params;
 
@@ -66,8 +66,8 @@ class AudioMessageFilter : public IPC::ChannelProxy::MessageFilter {
   // For access to |message_loop_|.
   friend class AudioRendererImplTest;
 
-  FRIEND_TEST(AudioMessageFilterTest, Basic);
-  FRIEND_TEST(AudioMessageFilterTest, Delegates);
+  FRIEND_TEST_ALL_PREFIXES(AudioMessageFilterTest, Basic);
+  FRIEND_TEST_ALL_PREFIXES(AudioMessageFilterTest, Delegates);
 
   // IPC::ChannelProxy::MessageFilter override. Called on IO thread.
   virtual bool OnMessageReceived(const IPC::Message& message);
diff --git a/chrome/renderer/media/audio_renderer_impl.h b/chrome/renderer/media/audio_renderer_impl.h
index 7c3aa58..07b5b88 100644
--- a/chrome/renderer/media/audio_renderer_impl.h
+++ b/chrome/renderer/media/audio_renderer_impl.h
@@ -37,6 +37,7 @@
 #ifndef CHROME_RENDERER_MEDIA_AUDIO_RENDERER_IMPL_H_
 #define CHROME_RENDERER_MEDIA_AUDIO_RENDERER_IMPL_H_
 
+#include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
 #include "base/lock.h"
 #include "base/shared_memory.h"
@@ -46,7 +47,6 @@
 #include "media/base/factory.h"
 #include "media/base/filters.h"
 #include "media/filters/audio_renderer_base.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 class AudioMessageFilter;
 
@@ -98,8 +98,9 @@ class AudioRendererImpl : public media::AudioRendererBase,
 
   // For access to constructor and IO thread methods.
   friend class AudioRendererImplTest;
-  FRIEND_TEST(AudioRendererImplTest, Stop);
-  FRIEND_TEST(AudioRendererImplTest, DestroyedMessageLoop_OnReadComplete);
+  FRIEND_TEST_ALL_PREFIXES(AudioRendererImplTest, Stop);
+  FRIEND_TEST_ALL_PREFIXES(AudioRendererImplTest,
+                           DestroyedMessageLoop_OnReadComplete);
 
   explicit AudioRendererImpl(AudioMessageFilter* filter);
   virtual ~AudioRendererImpl();
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index d3b0d7a..b83dff4 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -14,6 +14,7 @@
 
 #include "app/surface/transport_dib.h"
 #include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
 #include "base/linked_ptr.h"
 #include "base/timer.h"
 #include "base/weak_ptr.h"
@@ -34,7 +35,6 @@
 #include "chrome/renderer/render_widget.h"
 #include "chrome/renderer/renderer_webcookiejar_impl.h"
 #include "chrome/renderer/translate_helper.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrameClient.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerAction.h"
@@ -584,20 +584,20 @@ class RenderView : public RenderWidget,
   // For unit tests.
   friend class RenderViewTest;
   friend class PepperDeviceTest;
-  FRIEND_TEST(RenderViewTest, OnNavStateChanged);
-  FRIEND_TEST(RenderViewTest, OnImeStateChanged);
-  FRIEND_TEST(RenderViewTest, ImeComposition);
-  FRIEND_TEST(RenderViewTest, OnSetTextDirection);
-  FRIEND_TEST(RenderViewTest, OnPrintPages);
-  FRIEND_TEST(RenderViewTest, PrintWithIframe);
-  FRIEND_TEST(RenderViewTest, PrintLayoutTest);
-  FRIEND_TEST(RenderViewTest, OnHandleKeyboardEvent);
-  FRIEND_TEST(RenderViewTest, InsertCharacters);
+  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnNavStateChanged);
+  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnImeStateChanged);
+  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, ImeComposition);
+  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnSetTextDirection);
+  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnPrintPages);
+  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, PrintWithIframe);
+  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, PrintLayoutTest);
+  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnHandleKeyboardEvent);
+  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, InsertCharacters);
 #if defined(OS_MACOSX)
-  FRIEND_TEST(RenderViewTest, MacTestCmdUp);
+  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, MacTestCmdUp);
 #endif
-  FRIEND_TEST(RenderViewTest, JSBlockSentAfterPageLoad);
-  FRIEND_TEST(RenderViewTest, UpdateTargetURLWithInvalidURL);
+  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, JSBlockSentAfterPageLoad);
+  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, UpdateTargetURLWithInvalidURL);
 
   typedef std::map<GURL, ContentSettings> HostContentSettings;
   typedef std::map<GURL, int> HostZoomLevels;
diff --git a/chrome_frame/html_utils.h b/chrome_frame/html_utils.h
index 21eb8cc..8296b5f 100644
--- a/chrome_frame/html_utils.h
+++ b/chrome_frame/html_utils.h
@@ -11,8 +11,8 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
 #include "net/http/http_util.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 // Forward declarations
 class HtmlUtilUnittest;
@@ -88,7 +88,7 @@ class HTMLScanner {
 
  private:
   friend class HtmlUtilUnittest;
-  FRIEND_TEST(HtmlUtilUnittest, BasicTest);
+  FRIEND_TEST_ALL_PREFIXES(HtmlUtilUnittest, BasicTest);
 
   // Given html_string which represents the remaining html range, this method
   // returns the next tag in tag and advances html_string to one character after
diff --git a/gfx/skbitmap_operations.h b/gfx/skbitmap_operations.h
index 6f808e7..b077406 100644
--- a/gfx/skbitmap_operations.h
+++ b/gfx/skbitmap_operations.h
@@ -5,8 +5,8 @@
 #ifndef GFX_SKBITMAP_OPERATIONS_H_
 #define GFX_SKBITMAP_OPERATIONS_H_
 
+#include "base/gtest_prod_util.h"
 #include "gfx/color_utils.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 class SkBitmap;
 
@@ -91,8 +91,8 @@ class SkBitmapOperations {
  private:
   SkBitmapOperations();  // Class for scoping only.
 
-  FRIEND_TEST(SkBitmapOperationsTest, DownsampleByTwo);
-  FRIEND_TEST(SkBitmapOperationsTest, DownsampleByTwoSmall);
+  FRIEND_TEST_ALL_PREFIXES(SkBitmapOperationsTest, DownsampleByTwo);
+  FRIEND_TEST_ALL_PREFIXES(SkBitmapOperationsTest, DownsampleByTwoSmall);
 };
 
 #endif  // GFX_SKBITMAP_OPERATIONS_H_