Change AboutResourceLoader::GetAboutResource to wait for inflight update task.

chrome/browser/chromeos/drive/change_list_loader_unittest.cc

 // Copyright 2013 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/drive/change_list_loader.h"
 
 #include "base/callback_helpers.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/testing_pref_service.h"
@@ skipping 125 matching lines @@
   scoped_ptr<JobScheduler> scheduler_;
   scoped_ptr<ResourceMetadataStorage,
              test_util::DestroyHelperForTests> metadata_storage_;
   scoped_ptr<FileCache, test_util::DestroyHelperForTests> cache_;
   scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests> metadata_;
   scoped_ptr<AboutResourceLoader> about_resource_loader_;
   scoped_ptr<LoaderController> loader_controller_;
   scoped_ptr<ChangeListLoader> change_list_loader_;
 };
 
+TEST_F(ChangeListLoaderTest, AboutResourceLoader) {
+  google_apis::GDataErrorCode error[6] = {};
+  scoped_ptr<google_apis::AboutResource> about[6];
+
+  // No resource is cached at the beginning.
+  ASSERT_FALSE(about_resource_loader_->cached_about_resource());
+
+  // Since no resource is cached, this "Get" should trigger the update.
+  about_resource_loader_->GetAboutResource(
+      google_apis::test_util::CreateCopyResultCallback(error + 0, about + 0));
+  // Since there is one in-flight update, the next "Get" just wait for it.
+  about_resource_loader_->GetAboutResource(
+      google_apis::test_util::CreateCopyResultCallback(error + 1, about + 1));
+
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(google_apis::HTTP_SUCCESS, error[0]);
+  EXPECT_EQ(google_apis::HTTP_SUCCESS, error[1]);
+  const int64 first_changestamp = about[0]->largest_change_id();
+  EXPECT_EQ(first_changestamp, about[1]->largest_change_id());
+  ASSERT_TRUE(about_resource_loader_->cached_about_resource());
+  EXPECT_EQ(
+      first_changestamp,
+      about_resource_loader_->cached_about_resource()->largest_change_id());
+
+  // Increment changestamp by 1.
+  AddNewFile("temp");
+  // Explicitly calling UpdateAboutResource will start another API call.
+  about_resource_loader_->UpdateAboutResource(
+      google_apis::test_util::CreateCopyResultCallback(error + 2, about + 2));
+  // It again waits for the in-flight UpdateAboutResoure call, even though this
+  // time there is a cached result.
+  about_resource_loader_->GetAboutResource(
+      google_apis::test_util::CreateCopyResultCallback(error + 3, about + 3));
+
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(google_apis::HTTP_SUCCESS, error[2]);
+  EXPECT_EQ(google_apis::HTTP_SUCCESS, error[3]);
+  EXPECT_EQ(first_changestamp + 1, about[2]->largest_change_id());
+  EXPECT_EQ(first_changestamp + 1, about[3]->largest_change_id());
+  EXPECT_EQ(
+      first_changestamp + 1,
+      about_resource_loader_->cached_about_resource()->largest_change_id());
+
+  // Increment changestamp by 1.
+  AddNewFile("temp2");
+  // Now no UpdateAboutResource task is running. Returns the cached result.
+  about_resource_loader_->GetAboutResource(
+      google_apis::test_util::CreateCopyResultCallback(error + 4, about + 4));
+  // Explicitly calling UpdateAboutResource will start another API call.
+  about_resource_loader_->UpdateAboutResource(
+      google_apis::test_util::CreateCopyResultCallback(error + 5, about + 5));
+
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(google_apis::HTTP_NO_CONTENT, error[4]);
+  EXPECT_EQ(google_apis::HTTP_SUCCESS, error[5]);
+  EXPECT_EQ(first_changestamp + 1, about[4]->largest_change_id());
+  EXPECT_EQ(first_changestamp + 2, about[5]->largest_change_id());
+  EXPECT_EQ(
+      first_changestamp + 2,
+      about_resource_loader_->cached_about_resource()->largest_change_id());
+
+  EXPECT_EQ(3, drive_service_->about_resource_load_count());
+}
+
 TEST_F(ChangeListLoaderTest, Load) {
   EXPECT_FALSE(change_list_loader_->IsRefreshing());
 
   // Start initial load.
   TestChangeListLoaderObserver observer(change_list_loader_.get());
 
   EXPECT_EQ(0, drive_service_->about_resource_load_count());
 
   FileError error = FILE_ERROR_FAILED;
   change_list_loader_->LoadIfNeeded(
@@ skipping 172 matching lines @@
 
   // Unlock the loader, this should resume the pending udpate.
   lock.reset();
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(
       observer.changed_files().CountDirectory(util::GetDriveMyDriveRootPath()));
 }
 
 }  // namespace internal
 }  // namespace drive