[GTTF] Use FRIEND_TEST_ALL_PREFIXES in chrome/browser/chromeos

TEST=none
BUG=44549

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

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

6 files changed, 50 insertions, 37 deletions

diff --git a/chrome/browser/chromeos/external_metrics.h b/chrome/browser/chromeos/external_metrics.h
index 40b3ac8..0af3dad 100644
--- a/chrome/browser/chromeos/external_metrics.h
+++ b/chrome/browser/chromeos/external_metrics.h
@@ -8,9 +8,9 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
+#include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/task.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"  // For FRIEND_TEST
 
 namespace chromeos {
 
@@ -21,7 +21,7 @@ namespace chromeos {
 // normal UMA mechanism. The file is then truncated to zero size. Chrome uses
 // flock() to synchronize accesses to the file.
 class ExternalMetrics : public base::RefCountedThreadSafe<ExternalMetrics> {
-  FRIEND_TEST(ExternalMetricsTest, ParseExternalMetricsFile);
+  FRIEND_TEST_ALL_PREFIXES(ExternalMetricsTest, ParseExternalMetricsFile);
   friend class base::RefCountedThreadSafe<ExternalMetrics>;
 
  public:
diff --git a/chrome/browser/chromeos/login/google_authenticator.h b/chrome/browser/chromeos/login/google_authenticator.h
index cb069fc..228258b 100644
--- a/chrome/browser/chromeos/login/google_authenticator.h
+++ b/chrome/browser/chromeos/login/google_authenticator.h
@@ -7,15 +7,16 @@
 
 #include <string>
 #include <vector>
+
 #include "base/basictypes.h"
 #include "base/file_path.h"
+#include "base/gtest_prod_util.h"
 #include "base/ref_counted.h"
 #include "base/sha2.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/common/net/url_fetcher.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"  // For FRIEND_TEST
 
 // Authenticates a Chromium OS user against the Google Accounts ClientLogin API.
 
@@ -173,26 +174,33 @@ class GoogleAuthenticator : public Authenticator,
   bool try_again_;  // True if we're willing to retry the login attempt.
 
   friend class GoogleAuthenticatorTest;
-  FRIEND_TEST(GoogleAuthenticatorTest, SaltToAsciiTest);
-  FRIEND_TEST(GoogleAuthenticatorTest, CheckTwoFactorResponse);
-  FRIEND_TEST(GoogleAuthenticatorTest, CheckNormalErrorCode);
-  FRIEND_TEST(GoogleAuthenticatorTest, EmailAddressNoOp);
-  FRIEND_TEST(GoogleAuthenticatorTest, EmailAddressIgnoreCaps);
-  FRIEND_TEST(GoogleAuthenticatorTest, EmailAddressIgnoreDomainCaps);
-  FRIEND_TEST(GoogleAuthenticatorTest, EmailAddressIgnoreOneUsernameDot);
-  FRIEND_TEST(GoogleAuthenticatorTest, EmailAddressIgnoreManyUsernameDots);
-  FRIEND_TEST(GoogleAuthenticatorTest,
-              EmailAddressIgnoreConsecutiveUsernameDots);
-  FRIEND_TEST(GoogleAuthenticatorTest, EmailAddressDifferentOnesRejected);
-  FRIEND_TEST(GoogleAuthenticatorTest, EmailAddressIgnorePlusSuffix);
-  FRIEND_TEST(GoogleAuthenticatorTest, EmailAddressIgnoreMultiPlusSuffix);
-  FRIEND_TEST(GoogleAuthenticatorTest, ReadSaltTest);
-  FRIEND_TEST(GoogleAuthenticatorTest, ReadLocalaccountTest);
-  FRIEND_TEST(GoogleAuthenticatorTest, ReadLocalaccountTrailingWSTest);
-  FRIEND_TEST(GoogleAuthenticatorTest, ReadNoLocalaccountTest);
-  FRIEND_TEST(GoogleAuthenticatorTest, LoginNetFailureTest);
-  FRIEND_TEST(GoogleAuthenticatorTest, LoginDeniedTest);
-  FRIEND_TEST(GoogleAuthenticatorTest, TwoFactorLoginTest);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, SaltToAsciiTest);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, CheckTwoFactorResponse);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, CheckNormalErrorCode);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, EmailAddressNoOp);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, EmailAddressIgnoreCaps);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest,
+                           EmailAddressIgnoreDomainCaps);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest,
+                           EmailAddressIgnoreOneUsernameDot);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest,
+                           EmailAddressIgnoreManyUsernameDots);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest,
+                           EmailAddressIgnoreConsecutiveUsernameDots);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest,
+                           EmailAddressDifferentOnesRejected);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest,
+                           EmailAddressIgnorePlusSuffix);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest,
+                           EmailAddressIgnoreMultiPlusSuffix);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, ReadSaltTest);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, ReadLocalaccountTest);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest,
+                           ReadLocalaccountTrailingWSTest);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, ReadNoLocalaccountTest);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, LoginNetFailureTest);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, LoginDeniedTest);
+  FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, TwoFactorLoginTest);
 
   DISALLOW_COPY_AND_ASSIGN(GoogleAuthenticator);
 };
diff --git a/chrome/browser/chromeos/login/new_user_view.h b/chrome/browser/chromeos/login/new_user_view.h
index d3820e2..c36da0c 100644
--- a/chrome/browser/chromeos/login/new_user_view.h
+++ b/chrome/browser/chromeos/login/new_user_view.h
@@ -8,10 +8,10 @@
 #include <string>
 #include <vector>
 
+#include "base/gtest_prod_util.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/language_switch_model.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 #include "views/accelerator.h"
 #include "views/controls/button/button.h"
 #include "views/controls/button/menu_button.h"
@@ -150,8 +150,9 @@ class NewUserView : public views::View,
   // If true, this view needs RoundedRect border and background.
   bool need_border_;
 
-  FRIEND_TEST(LoginScreenTest, IncognitoLogin);
+  FRIEND_TEST_ALL_PREFIXES(LoginScreenTest, IncognitoLogin);
   friend class LoginScreenTest;
+
   DISALLOW_COPY_AND_ASSIGN(NewUserView);
 };
 
diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
index f78eb58..0bc0f6a 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/screen_observer.h"
 #include "chrome/browser/chromeos/login/view_screen.h"
@@ -166,13 +167,16 @@ class WizardController : public chromeos::ScreenObserver,
   // Partner startup customizations.
   scoped_ptr<const chromeos::StartupCustomizationDocument> customization_;
 
-  FRIEND_TEST(WizardControllerFlowTest, ControlFlowErrorNetwork);
-  FRIEND_TEST(WizardControllerFlowTest, ControlFlowErrorUpdate);
-  FRIEND_TEST(WizardControllerFlowTest, ControlFlowLanguageOnLogin);
-  FRIEND_TEST(WizardControllerFlowTest, ControlFlowLanguageOnNetwork);
-  FRIEND_TEST(WizardControllerFlowTest, ControlFlowMain);
-  FRIEND_TEST(WizardControllerTest, SwitchLanguage);
+  FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, ControlFlowErrorNetwork);
+  FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, ControlFlowErrorUpdate);
+  FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest,
+                           ControlFlowLanguageOnLogin);
+  FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest,
+                           ControlFlowLanguageOnNetwork);
+  FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, ControlFlowMain);
+  FRIEND_TEST_ALL_PREFIXES(WizardControllerTest, SwitchLanguage);
   friend class WizardControllerFlowTest;
+
   DISALLOW_COPY_AND_ASSIGN(WizardController);
 };
 
diff --git a/chrome/browser/chromeos/options/wifi_config_view.h b/chrome/browser/chromeos/options/wifi_config_view.h
index bcfd442..2e97971 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.h
+++ b/chrome/browser/chromeos/options/wifi_config_view.h
@@ -8,10 +8,10 @@
 #include <string>
 
 #include "base/file_path.h"
+#include "base/gtest_prod_util.h"
 #include "base/string16.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/shell_dialogs.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 #include "views/controls/button/button.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/button/image_button.h"
@@ -65,9 +65,9 @@ class WifiConfigView : public views::View,
   void FocusFirstField();
 
  private:
-  FRIEND_TEST(WifiConfigViewTest, NoChangeSaveTest);
-  FRIEND_TEST(WifiConfigViewTest, ChangeAutoConnectSaveTest);
-  FRIEND_TEST(WifiConfigViewTest, ChangePasswordSaveTest);
+  FRIEND_TEST_ALL_PREFIXES(WifiConfigViewTest, NoChangeSaveTest);
+  FRIEND_TEST_ALL_PREFIXES(WifiConfigViewTest, ChangeAutoConnectSaveTest);
+  FRIEND_TEST_ALL_PREFIXES(WifiConfigViewTest, ChangePasswordSaveTest);
 
   // Initializes UI.
   void Init();
diff --git a/chrome/browser/chromeos/version_loader.h b/chrome/browser/chromeos/version_loader.h
index cda36d3..c7072b5 100644
--- a/chrome/browser/chromeos/version_loader.h
+++ b/chrome/browser/chromeos/version_loader.h
@@ -8,8 +8,8 @@
 #include <string>
 
 #include "base/callback.h"
+#include "base/gtest_prod_util.h"
 #include "chrome/browser/cancelable_request.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 class FilePath;
 
@@ -41,7 +41,7 @@ class VersionLoader : public CancelableRequestProvider {
                     GetVersionCallback* callback);
 
  private:
-  FRIEND_TEST(VersionLoaderTest, ParseVersion);
+  FRIEND_TEST_ALL_PREFIXES(VersionLoaderTest, ParseVersion);
 
   // VersionLoader calls into the Backend on the file thread to load
   // and extract the version.