| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/gdata/gdata_contacts_service.h" | 5 #include "chrome/browser/chromeos/gdata/gdata_contacts_service.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| 11 #include "base/stringprintf.h" | 11 #include "base/stringprintf.h" |
| 12 #include "base/time.h" | 12 #include "base/time.h" |
| 13 #include "chrome/browser/chromeos/contacts/contact.pb.h" | 13 #include "chrome/browser/chromeos/contacts/contact.pb.h" |
| 14 #include "chrome/browser/chromeos/contacts/contact_test_util.h" | 14 #include "chrome/browser/chromeos/contacts/contact_test_util.h" |
| 15 #include "chrome/browser/chromeos/gdata/gdata_auth_service.h" | 15 #include "chrome/browser/chromeos/gdata/auth_service.h" |
| 16 #include "chrome/browser/chromeos/gdata/gdata_util.h" | 16 #include "chrome/browser/chromeos/gdata/gdata_util.h" |
| 17 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
| 18 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
| 19 #include "chrome/test/base/in_process_browser_test.h" | 19 #include "chrome/test/base/in_process_browser_test.h" |
| 20 #include "content/public/browser/browser_thread.h" | 20 #include "content/public/browser/browser_thread.h" |
| 21 #include "content/public/test/test_utils.h" | 21 #include "content/public/test/test_utils.h" |
| 22 #include "net/test/test_server.h" | 22 #include "net/test/test_server.h" |
| 23 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
| 24 #include "ui/gfx/size.h" | 24 #include "ui/gfx/size.h" |
| 25 | 25 |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 "2012-06-04T15:53:36.023Z", | 286 "2012-06-04T15:53:36.023Z", |
| 287 false, "", "", "", "", "", "", contact); | 287 false, "", "", "", "", "", "", contact); |
| 288 contacts::test::SetPhoto(gfx::Size(kPhotoSize, kPhotoSize), contact); | 288 contacts::test::SetPhoto(gfx::Size(kPhotoSize, kPhotoSize), contact); |
| 289 expected_contacts.push_back(contact); | 289 expected_contacts.push_back(contact); |
| 290 } | 290 } |
| 291 EXPECT_EQ(contacts::test::ContactsToString(expected_contacts), | 291 EXPECT_EQ(contacts::test::ContactsToString(expected_contacts), |
| 292 contacts::test::ContactsToString(*contacts)); | 292 contacts::test::ContactsToString(*contacts)); |
| 293 } | 293 } |
| 294 | 294 |
| 295 } // namespace gdata | 295 } // namespace gdata |
| OLD | NEW |