Move all wallpaper file loading and decoding from DesktopBackgroundController to WallpaperManager.

ash/test/ash_test_base.h

Index: ash/test/ash_test_base.h
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index 193e71aaf1d24ad78a4594df4f7103a27ef17c66..12603b7918aec0f73654c7dda7b2588e53c49e51 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -93,6 +93,14 @@ class AshTestBase : public testing::Test {
   // hasn't been created yet.
   aura::test::EventGenerator& GetEventGenerator();
 
+  // True if the running environment supports multiple displays,
+  // or false otherwise (e.g. win8 bot).
+  static bool SupportsMultipleDisplays();
+
+  // True if the running environment supports host window resize,
+  // or false otherwise (e.g. win8 bot).
+  static bool SupportsHostWindowResize();
+
  protected:
   enum UserSessionBlockReason {
     FIRST_BLOCK_REASON,
@@ -102,14 +110,6 @@ class AshTestBase : public testing::Test {
     NUMBER_OF_BLOCK_REASONS
   };
 
-  // True if the running environment supports multiple displays,
-  // or false otherwise (e.g. win8 bot).
-  static bool SupportsMultipleDisplays();
-
-  // True if the running environment supports host window resize,
-  // or false otherwise (e.g. win8 bot).
-  static bool SupportsHostWindowResize();

[oshima, 2014/04/07 17:16:11]

Would you mind moving the body of this method to
AshTestHelper public method, and change this impl to simply call it,
instead of exposing this to tests that doesn't use this class as a base.

[Alexander Alekseev, 2014/04/08 13:18:49]

Done.

-
   void set_start_session(bool start_session) { start_session_ = start_session; }
 
   AshTestHelper* ash_test_helper() { return ash_test_helper_.get(); }