Make image_decoder a Leaky LazyInstance

chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.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_SUPERVISED_SUPERVISED_USER_CREATION_SCREEN_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCREEN_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 14 matching lines @@
 class ErrorScreensHistogramHelper;
 class NetworkState;
 class ScreenManager;
 
 // Class that controls screen showing ui for supervised user creation.
 class SupervisedUserCreationScreen
     : public BaseScreen,
       public SupervisedUserCreationScreenHandler::Delegate,
       public SupervisedUserCreationController::StatusConsumer,
       public SupervisedUserSyncServiceObserver,
-      public ImageDecoder::Delegate,
+      public ImageDecoder::ImageRequest,
       public NetworkPortalDetector::Observer,
       public CameraPresenceNotifier::Observer {
  public:
   SupervisedUserCreationScreen(BaseScreenDelegate* base_screen_delegate,
                                SupervisedUserCreationScreenHandler* actor);
   ~SupervisedUserCreationScreen() override;
 
   static SupervisedUserCreationScreen* Get(ScreenManager* manager);
 
   // Makes screen to show message about inconsistency in manager login flow
@@ skipping 63 matching lines @@
       const NetworkPortalDetector::CaptivePortalState& state) override;
 
   // TODO(antrim) : this is an explicit code duplications with UserImageScreen.
   // It should be removed by issue 251179.
 
   // SupervisedUserCreationScreenHandler::Delegate (image) implementation:
   void OnPhotoTaken(const std::string& raw_data) override;
   void OnImageSelected(const std::string& image_url,
                        const std::string& image_type) override;
   void OnImageAccepted() override;
-  // ImageDecoder::Delegate overrides:
-  void OnImageDecoded(const ImageDecoder* decoder,
-                      const SkBitmap& decoded_image) override;
-  void OnDecodeImageFailed(const ImageDecoder* decoder) override;
+  // ImageDecoder::ImageRequest overrides:
+  void OnImageDecoded(const SkBitmap& decoded_image) override;
+  void OnDecodeImageFailed() override;
 
  private:
   void ApplyPicture();
   void OnGetSupervisedUsers(const base::DictionaryValue* users);
 
   SupervisedUserCreationScreenHandler* actor_;
 
   scoped_ptr<SupervisedUserCreationController> controller_;
   scoped_ptr<base::DictionaryValue> existing_users_;
 
   bool on_error_screen_;
   bool manager_signin_in_progress_;
   std::string last_page_;
 
   SupervisedUserSyncService* sync_service_;
 
   gfx::ImageSkia user_photo_;
-  scoped_refptr<ImageDecoder> image_decoder_;
   bool apply_photo_after_decoding_;
   int selected_image_;
 
   scoped_ptr<ErrorScreensHistogramHelper> histogram_helper_;
 
   base::WeakPtrFactory<SupervisedUserCreationScreen> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationScreen);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCREEN_H_