chromeos: Use protocol buffers for Contact class.

chrome/browser/chromeos/contacts/contact_test_util.h

Index: chrome/browser/chromeos/contacts/contact_test_util.h
diff --git a/chrome/browser/chromeos/contacts/contact_test_util.h b/chrome/browser/chromeos/contacts/contact_test_util.h
index d42c71cfef4bad6510e40ce175d60965e919bfdd..4a61cde8b6861f66986eac4be576fc88069e7a7e 100644
--- a/chrome/browser/chromeos/contacts/contact_test_util.h
+++ b/chrome/browser/chromeos/contacts/contact_test_util.h
@@ -8,12 +8,14 @@
 #include <string>
 
 #include "base/memory/scoped_vector.h"
-#include "chrome/browser/chromeos/contacts/contact.h"
+#include "chrome/browser/chromeos/contacts/contact.pb.h"
 #include "ui/gfx/size.h"
 
 namespace contacts {
 namespace test {
 
+typedef std::vector<const Contact*> ContactPointers;
+
 // Returns a string containing the information stored in |contact|.  The same
 // string will be returned for functionally-equivalent contacts (e.g. ones
 // containing the same email addresses but in a different order).
@@ -28,9 +30,6 @@ std::string ContactsToString(const ScopedVector<Contact>& contacts);
 // const Contact* arguments.
 std::string VarContactsToString(int num_contacts, ...);
 
-// Copies |source|'s data to |dest|.
-void CopyContact(const Contact& source, Contact* dest);
-
 // Saves copies of all contacts in |source| to |dest|.
 void CopyContacts(const ContactPointers& source,
                   ScopedVector<Contact>* dest);
@@ -49,21 +48,21 @@ void InitContact(const std::string& provider_id,
 
 // Adds an email address to |contact|.
 void AddEmailAddress(const std::string& address,
-                     Contact::AddressType::Relation relation,
+                     Contact_AddressType_Relation relation,
                      const std::string& label,
                      bool primary,
                      Contact* contact);
 
 // Adds a phone number to |contact|.
 void AddPhoneNumber(const std::string& number,
-                    Contact::AddressType::Relation relation,
+                    Contact_AddressType_Relation relation,
                     const std::string& label,
                     bool primary,
                     Contact* contact);
 
 // Adds a postal address to |contact|.
 void AddPostalAddress(const std::string& address,
-                      Contact::AddressType::Relation relation,
+                      Contact_AddressType_Relation relation,
                       const std::string& label,
                       bool primary,
                       Contact* contact);
@@ -71,8 +70,8 @@ void AddPostalAddress(const std::string& address,
 // Adds an IM address to |contact|.
 void AddInstantMessagingAddress(
     const std::string& address,
-    Contact::InstantMessagingAddress::Protocol protocol,
-    Contact::AddressType::Relation relation,
+    Contact_InstantMessagingAddress_Protocol protocol,
+    Contact_AddressType_Relation relation,
     const std::string& label,
     bool primary,
     Contact* contact);