Revert of cheets: implement cros side of WallpaperManagerService.

components/arc/intent_helper/arc_intent_helper_bridge.cc

 // Copyright 2016 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 "components/arc/intent_helper/arc_intent_helper_bridge.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/common/new_window_delegate.h"
@@ skipping 10 matching lines @@
 #include "url/gurl.h"
 
 namespace arc {
 
 namespace {
 
 constexpr char kArcIntentHelperPackageName[] = "org.chromium.arc.intent_helper";
 
 }  // namespace
 
-// TODO(muyuanli): This will be removed once SetWallpaperDelegate class is
-// removed.
-SetWallpaperDelegate* SetWallpaperDelegate::instance_ = nullptr;
-
 ArcIntentHelperBridge::ArcIntentHelperBridge(
     ArcBridgeService* bridge_service,
     const scoped_refptr<ActivityIconLoader>& icon_loader,
+    std::unique_ptr<SetWallpaperDelegate> set_wallpaper_delegate,
     const scoped_refptr<LocalActivityResolver>& activity_resolver)
     : ArcService(bridge_service),
       binding_(this),
       icon_loader_(icon_loader),
+      set_wallpaper_delegate_(std::move(set_wallpaper_delegate)),
       activity_resolver_(activity_resolver) {
   DCHECK(thread_checker_.CalledOnValidThread());
   arc_bridge_service()->intent_helper()->AddObserver(this);
 }
 
 ArcIntentHelperBridge::~ArcIntentHelperBridge() {
   DCHECK(thread_checker_.CalledOnValidThread());
   arc_bridge_service()->intent_helper()->RemoveObserver(this);
 }
 
@@ skipping 30 matching lines @@
   ash::WmShell::Get()->delegate()->OpenUrlFromArc(gurl);
 }
 
 void ArcIntentHelperBridge::OpenWallpaperPicker() {
   DCHECK(thread_checker_.CalledOnValidThread());
   ash::WmShell::Get()->wallpaper_delegate()->OpenSetWallpaperPage();
 }
 
 void ArcIntentHelperBridge::SetWallpaper(mojo::Array<uint8_t> jpeg_data) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  SetWallpaperDelegate* delegate = SetWallpaperDelegate::instance();
-  if (delegate == nullptr) {
-    LOG(ERROR) << "SetWallpaperDelegate is not available.";
-    return;
-  }
-  delegate->SetWallpaperJpeg(jpeg_data.PassStorage());
+  set_wallpaper_delegate_->SetWallpaper(jpeg_data.PassStorage());
 }
 
 std::unique_ptr<ash::LinkHandlerModel> ArcIntentHelperBridge::CreateModel(
     const GURL& url) {
   DCHECK(thread_checker_.CalledOnValidThread());
   std::unique_ptr<LinkHandlerModelImpl> impl(
       new LinkHandlerModelImpl(icon_loader_));
   if (!impl->Init(url))
     return nullptr;
   return std::move(impl);
@@ skipping 18 matching lines @@
   return handlers_filtered;
 }
 
 void ArcIntentHelperBridge::OnIntentFiltersUpdated(
     mojo::Array<mojom::IntentFilterPtr> filters) {
   DCHECK(thread_checker_.CalledOnValidThread());
   activity_resolver_->UpdateIntentFilters(std::move(filters));
 }
 
 }  // namespace arc