Remove layer of indirection in PhoneNumberTest

chrome/browser/autofill/phone_number.h

 // Copyright (c) 2010 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_AUTOFILL_PHONE_NUMBER_H_
 #define CHROME_BROWSER_AUTOFILL_PHONE_NUMBER_H_
 #pragma once
 
 #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.
 class PhoneNumber : public FormGroup {
  public:
   PhoneNumber();
   virtual ~PhoneNumber();
 
   // FormGroup implementation:
   virtual FormGroup* Clone() const = 0;
@@ skipping 19 matching lines @@
   // Size and offset of the prefix and suffix portions of phone numbers.
   static const int kPrefixOffset = 0;
   static const int kPrefixLength = 3;
   static const int kSuffixOffset = 3;
   static const int kSuffixLength = 4;
 
  protected:
   explicit PhoneNumber(const PhoneNumber& phone_number);
 
  private:
-  // For test.
-  friend class PhoneNumberTest;
+  FRIEND_TEST_ALL_PREFIXES(PhoneNumberTest, Matcher);
 
   void operator=(const PhoneNumber& phone_number);
 
   const string16& country_code() const { return country_code_; }
   const string16& city_code() const { return city_code_; }
   const string16& number() const { return number_; }
   const string16& extension() const { return extension_; }
   string16 CityAndNumber() const { return city_code_ + number_; }
 
   // Returns the entire phone number as a string, without punctuation.
@@ skipping 36 matching lines @@
   static void StripPunctuation(string16* number);
 
   // The pieces of the phone number.
   string16 country_code_;
   string16 city_code_;  // city or area code.
   string16 number_;
   string16 extension_;
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_PHONE_NUMBER_H_