contacts: Rate-limit GData photo requests and handle 404s.

chrome/browser/chromeos/gdata/gdata_contacts_service_browsertest.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/chromeos/gdata/gdata_contacts_service.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
@@ skipping 65 matching lines @@
 
   virtual void SetUpOnMainThread() OVERRIDE {
     ASSERT_TRUE(test_server_.Start());
     service_.reset(new GDataContactsService(browser()->profile()));
     service_->Initialize();
     service_->auth_service_for_testing()->set_access_token_for_testing(
         net::TestServer::kGDataAuthToken);
     service_->set_rewrite_photo_url_callback_for_testing(
         base::Bind(&GDataContactsServiceTest::RewritePhotoUrl,
                    base::Unretained(this)));
+    service_->set_photo_download_timer_interval_for_testing(
+        base::TimeDelta::FromMilliseconds(10));
   }
 
   virtual void CleanUpOnMainThread() {
     service_.reset();
   }
 
  protected:
   GDataContactsService* service() { return service_.get(); }
 
   // Downloads contacts from |feed_filename| (within the chromeos/gdata/contacts
@@ skipping 56 matching lines @@
 // Test that we report failure for feeds that are broken in various ways.
 IN_PROC_BROWSER_TEST_F(GDataContactsServiceTest, BrokenFeeds) {
   scoped_ptr<ScopedVector<contacts::Contact> > contacts;
   EXPECT_FALSE(Download("some_bogus_file", base::Time(), &contacts));
   EXPECT_FALSE(Download("empty.txt", base::Time(), &contacts));
   EXPECT_FALSE(Download("not_json.txt", base::Time(), &contacts));
   EXPECT_FALSE(Download("not_dictionary.json", base::Time(), &contacts));
   EXPECT_FALSE(Download("no_feed.json", base::Time(), &contacts));
   EXPECT_FALSE(Download("no_category.json", base::Time(), &contacts));
   EXPECT_FALSE(Download("wrong_category.json", base::Time(), &contacts));
-  EXPECT_FALSE(Download("feed_photo_404.json", base::Time(), &contacts));
+
+  // Missing photos should be allowed, though (as this can occur in production).
+  EXPECT_TRUE(Download("feed_photo_404.json", base::Time(), &contacts));
+  ASSERT_EQ(static_cast<size_t>(1), contacts->size());
+  EXPECT_FALSE((*contacts)[0]->has_raw_untrusted_photo());
 }
 
 // Check that we're able to download an empty feed and a normal-looking feed
 // with two regular contacts and one deleted one.
 IN_PROC_BROWSER_TEST_F(GDataContactsServiceTest, Download) {
   scoped_ptr<ScopedVector<contacts::Contact> > contacts;
   EXPECT_TRUE(Download("no_entries.json", base::Time(), &contacts));
   EXPECT_TRUE(contacts->empty());
 
   EXPECT_TRUE(Download("feed.json", base::Time(), &contacts));
@@ skipping 58 matching lines @@
   EXPECT_EQ(contacts::test::VarContactsToString(
                 3, contact1.get(), contact2.get(), contact3.get()),
             contacts::test::ContactsToString(*contacts));
 }
 
 // Download a feed containing more photos than we're able to download in
 // parallel to check that we still end up with all the photos.
 IN_PROC_BROWSER_TEST_F(GDataContactsServiceTest, ParallelPhotoDownload) {
   // The feed used for this test contains 8 contacts.
   const int kNumContacts = 8;
-  service()->set_max_simultaneous_photo_downloads_for_testing(2);
+  service()->set_max_photo_downloads_per_second_for_testing(6);
   scoped_ptr<ScopedVector<contacts::Contact> > contacts;
   EXPECT_TRUE(Download("feed_multiple_photos.json", base::Time(), &contacts));
   ASSERT_EQ(static_cast<size_t>(kNumContacts), contacts->size());
 
   ScopedVector<contacts::Contact> expected_contacts;
   for (int i = 0; i < kNumContacts; ++i) {
     contacts::Contact* contact = new contacts::Contact;
     InitContact(base::StringPrintf("http://example.com/%d", i + 1),
                 "2012-06-04T15:53:36.023Z",
                 false, "", "", "", "", "", "", contact);
     contacts::test::SetPhoto(gfx::Size(kPhotoSize, kPhotoSize), contact);
     expected_contacts.push_back(contact);
   }
   EXPECT_EQ(contacts::test::ContactsToString(expected_contacts),
             contacts::test::ContactsToString(*contacts));
 }
 
 }  // namespace gdata