Add browser test for CustomizationWallpaperDownloader.

chrome/browser/chromeos/login/wallpaper_manager.cc

 // Copyright (c) 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/login/wallpaper_manager.h"
 
 #include <numeric>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 402 matching lines @@
   if (!started_load_at_.is_null()) {
     const base::TimeDelta elapsed = base::Time::Now() - started_load_at_;
     manager->SaveLastLoadTime(elapsed);
   }
   if (manager->pending_inactive_ == this) {
     // ProcessRequest() was never executed.
     manager->pending_inactive_ = NULL;
   }
 
   // Destroy self.
-  DCHECK(manager->loading_.size() > 0);
-
-  for (WallpaperManager::PendingList::iterator i = manager->loading_.begin();
-       i != manager->loading_.end();
-       ++i)
-    if (i->get() == this) {
-      manager->loading_.erase(i);
-      break;
-    }
+  manager->RemovePendingWallpaperFromList(this);
 }
 
 // WallpaperManager, public: ---------------------------------------------------
 
 // TestApi. For testing purpose
 WallpaperManager::TestApi::TestApi(WallpaperManager* wallpaper_manager)
     : wallpaper_manager_(wallpaper_manager) {
 }
 
 WallpaperManager::TestApi::~TestApi() {
@@ skipping 1304 matching lines @@
   if (!pending_inactive_) {
     loading_.push_back(new WallpaperManager::PendingWallpaper(
         (delayed ? GetWallpaperLoadDelay()
                  : base::TimeDelta::FromMilliseconds(0)),
         user_id));
     pending_inactive_ = loading_.back();
   }
   return pending_inactive_;
 }
 
+void WallpaperManager::RemovePendingWallpaperFromList(
+    PendingWallpaper* pending) {
+  DCHECK(loading_.size() > 0);
+  for (WallpaperManager::PendingList::iterator i = loading_.begin();
+       i != loading_.end();
+       ++i)

[Daniel Erat, 2014/04/30 00:24:22]

you need curly brackets here

[Alexander Alekseev, 2014/04/30 01:10:22]

Done.

+    if (i->get() == pending) {
+      loading_.erase(i);
+      break;
+    }
+
+  if (loading_.size() == 0)

[Daniel Erat, 2014/04/30 00:24:22]

nit: if (loading_.empty())

[Alexander Alekseev, 2014/04/30 01:10:22]

Done.

+    FOR_EACH_OBSERVER(Observer, observers_, OnPendingListEmptyForTesting());
+}
+
 void WallpaperManager::SetCustomizedDefaultWallpaper(
     const GURL& wallpaper_url,
     const base::FilePath& downloaded_file,
     const base::FilePath& resized_directory) {
   // Should fail if this ever happens in tests.
   DCHECK(wallpaper_url.is_valid());
   if (!wallpaper_url.is_valid()) {
     if (!wallpaper_url.is_empty()) {
       LOG(WARNING) << "Invalid Customized Wallpaper URL '"
                    << wallpaper_url.spec() << "'";
@@ skipping 107 matching lines @@
     }
   }
 
   if (need_update_screen) {
     DoSetDefaultWallpaper(std::string(),
                           MovableOnDestroyCallbackHolder().Pass());
   }
 }
 
 }  // namespace chromeos