drive: Stop making multiple GetAppList() requests from DriveAppRegistry

chrome/browser/chromeos/drive/drive_app_registry_unittest.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/drive/drive_app_registry.h"
 
 #include "base/files/file_path.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 12 matching lines @@
     test_util::RegisterDrivePrefs(pref_service_->registry());
 
     fake_drive_service_.reset(new FakeDriveService);
     fake_drive_service_->LoadAppListForDriveApi("drive/applist.json");
 
     scheduler_.reset(new JobScheduler(pref_service_.get(),
                                       fake_drive_service_.get(),
                                       base::MessageLoopProxy::current().get()));
 
     web_apps_registry_.reset(new DriveAppRegistry(scheduler_.get()));
-    web_apps_registry_->Update();
-    base::RunLoop().RunUntilIdle();
   }
 
   bool VerifyApp(const ScopedVector<DriveAppInfo>& list,
                  const std::string& web_store_id,
                  const std::string& app_id,
                  const std::string& app_name,
                  const std::string& object_type,
                  bool is_primary) {
     bool found = false;
     for (ScopedVector<DriveAppInfo>::const_iterator it = list.begin();
          it != list.end(); ++it) {
       const DriveAppInfo* app = *it;
       if (web_store_id == app->web_store_id) {
         EXPECT_EQ(app_id, app->app_id);
         EXPECT_EQ(app_name, UTF16ToUTF8(app->app_name));
         EXPECT_EQ(object_type, UTF16ToUTF8(app->object_type));
         EXPECT_EQ(is_primary, app->is_primary_selector);
         found = true;
         break;
       }
     }
     EXPECT_TRUE(found) << "Unable to find app with web_store_id "
-        << web_store_id;
+                       << web_store_id;
     return found;
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<TestingPrefServiceSimple> pref_service_;
   scoped_ptr<FakeDriveService> fake_drive_service_;
   scoped_ptr<JobScheduler> scheduler_;
   scoped_ptr<DriveAppRegistry> web_apps_registry_;
 };
 
 TEST_F(DriveAppRegistryTest, LoadAndFindDriveApps) {
+  web_apps_registry_->Update();
+  base::RunLoop().RunUntilIdle();
+
   // Find by primary extension 'exe'.
   ScopedVector<DriveAppInfo> ext_results;
   base::FilePath ext_file(FILE_PATH_LITERAL("drive/file.exe"));
   web_apps_registry_->GetAppsForFile(ext_file, std::string(), &ext_results);
   ASSERT_EQ(1U, ext_results.size());
   VerifyApp(ext_results, "abcdefghabcdefghabcdefghabcdefgh", "123456788192",
             "Drive app 1", "", true);
 
   // Find by primary MIME type.
   ScopedVector<DriveAppInfo> primary_app;
   web_apps_registry_->GetAppsForFile(base::FilePath(),
       "application/vnd.google-apps.drive-sdk.123456788192", &primary_app);
   ASSERT_EQ(1U, primary_app.size());
   VerifyApp(primary_app, "abcdefghabcdefghabcdefghabcdefgh", "123456788192",
             "Drive app 1", "", true);
 
   // Find by secondary MIME type.
   ScopedVector<DriveAppInfo> secondary_app;
   web_apps_registry_->GetAppsForFile(
       base::FilePath(), "text/html", &secondary_app);
   ASSERT_EQ(1U, secondary_app.size());
   VerifyApp(secondary_app, "abcdefghabcdefghabcdefghabcdefgh", "123456788192",
             "Drive app 1", "", false);
 }
 
+TEST_F(DriveAppRegistryTest, MultipleUpdate) {
+  // Call Update().
+  web_apps_registry_->Update();
+
+  // Call Update() again.
+  // This call should be ignored because there is already an ongoing update.
+  web_apps_registry_->Update();
+
+  // The app list should be loaded only once.
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(1, fake_drive_service_->app_list_load_count());
+}
+
 }  // namespace drive