Remove layer of indirection in PhoneNumberTest

chrome/browser/autofill/phone_number.h

Index: chrome/browser/autofill/phone_number.h
diff --git a/chrome/browser/autofill/phone_number.h b/chrome/browser/autofill/phone_number.h
index 277e1b16586c11143f4e2e6c723807c0796eed2a..25648bc0b81a626c634f0006981667a12c1f751b 100644
--- a/chrome/browser/autofill/phone_number.h
+++ b/chrome/browser/autofill/phone_number.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/string16.h"
+#include "base/gtest_prod_util.h"
 #include "chrome/browser/autofill/form_group.h"
 
 // A form group that stores phone number information.
@@ -48,8 +49,7 @@ class PhoneNumber : public FormGroup {
   explicit PhoneNumber(const PhoneNumber& phone_number);
 
  private:
-  // For test.
-  friend class PhoneNumberTest;
+  FRIEND_TEST_ALL_PREFIXES(PhoneNumberTest, Matcher);
 
   void operator=(const PhoneNumber& phone_number);