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

ash/test/ash_test_base.h

 // 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.
 
 #ifndef ASH_TEST_ASH_TEST_BASE_H_
 #define ASH_TEST_ASH_TEST_BASE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 75 matching lines @@
       const gfx::Rect& bounds);
 
   // Attach |window| to the current shell's root window.
   void ParentWindowInPrimaryRootWindow(aura::Window* window);
 
   // Returns the EventGenerator that uses screen coordinates and works
   // across multiple displays. It createse a new generator if it
   // 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,
     BLOCKED_BY_LOCK_SCREEN = FIRST_BLOCK_REASON,
     BLOCKED_BY_LOGIN_SCREEN,
     BLOCKED_BY_USER_ADDING_SCREEN,
     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(); }
 
   void RunAllPendingInMessageLoop();
 
   TestScreenshotDelegate* GetScreenshotDelegate();
   TestSystemTrayDelegate* GetSystemTrayDelegate();
 
   // Utility methods to emulate user logged in or not, session started or not
@@ skipping 36 matching lines @@
   virtual ~NoSessionAshTestBase() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_BASE_H_