Revert of Wallpaper manager now observing user child user status to update default wallpaper.

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_H_
 
 #include <deque>
 #include <string>
 #include <vector>
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_loader.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_image/user_image.h"
-#include "components/user_manager/user_manager.h"
 #include "components/wallpaper/wallpaper_layout.h"
 #include "components/wallpaper/wallpaper_manager_base.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "third_party/icu/source/i18n/unicode/timezone.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace chromeos {
 
-class WallpaperManager :
-    public wallpaper::WallpaperManagerBase,
-    public user_manager::UserManager::UserSessionStateObserver {
+class WallpaperManager : public wallpaper::WallpaperManagerBase {
  public:
   class PendingWallpaper;
 
   WallpaperManager();
   ~WallpaperManager() override;
 
   // Get pointer to singleton WallpaperManager instance, create it if necessary.
   static WallpaperManager* Get();
 
   // Returns the appropriate wallpaper resolution for all root windows.
@@ skipping 64 matching lines @@
   // Sets wallpaper to |image| (asynchronously with zero delay). If
   // |update_wallpaper| is false, skip change wallpaper but only update cache.
   void SetWallpaperFromImageSkia(const std::string& user_id,
                                  const gfx::ImageSkia& image,
                                  wallpaper::WallpaperLayout layout,
                                  bool update_wallpaper) override;
 
   // Returns queue size.
   size_t GetPendingListSizeForTesting() const override;
 
-  // Overridden from user_manager::UserManager::UserSessionStateObserver:
-  void UserChangedChildStatus(user_manager::User* user) override;
-
  private:
   friend class TestApi;
   friend class WallpaperManagerBrowserTest;
   friend class WallpaperManagerBrowserTestDefaultWallpaper;
   friend class WallpaperManagerPolicyTest;
 
   // Clears all obsolete wallpaper prefs from old version wallpaper pickers.
   void ClearObsoleteWallpaperPrefs() override;
 
   // Initialize wallpaper of registered device after device policy is trusted.
@@ skipping 87 matching lines @@
   typedef std::vector<scoped_refptr<PendingWallpaper> > PendingList;
   PendingList loading_;
 
   base::WeakPtrFactory<WallpaperManager> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(WallpaperManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_H_