Cleanup mojo Wallpaper interfaces for mash.

chrome/browser/chromeos/chrome_interface_factory.cc

Index: chrome/browser/chromeos/chrome_interface_factory.cc
diff --git a/chrome/browser/chromeos/chrome_interface_factory.cc b/chrome/browser/chromeos/chrome_interface_factory.cc
index 03d4879ff27af4322ca02f75298adb175e5dcd2c..20c47b34c57b7fadb335c30b464b503f513edded 100644
--- a/chrome/browser/chromeos/chrome_interface_factory.cc
+++ b/chrome/browser/chromeos/chrome_interface_factory.cc
@@ -7,16 +7,15 @@
 #include <memory>
 
 #include "ash/common/mojo_interface_factory.h"
-#include "ash/public/interfaces/wallpaper.mojom.h"
 #include "base/lazy_instance.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/app_list/app_list_presenter_service.h"
 #include "chrome/browser/ui/ash/ash_util.h"
-#include "chrome/browser/ui/ash/chrome_wallpaper_manager.h"
 #include "chrome/browser/ui/ash/keyboard_ui_service.h"
 #include "chrome/browser/ui/ash/system_tray_client.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ -122,9 +121,7 @@ class FactoryImpl {
   }
 
   void BindRequest(ash::mojom::WallpaperManagerRequest request) {
-    if (!wallpaper_manager_)
-      wallpaper_manager_.reset(new ChromeWallpaperManager);
-    wallpaper_manager_->ProcessRequest(std::move(request));
+    chromeos::WallpaperManager::Get()->BindRequest(std::move(request));

[James Cook, 2016/10/11 23:21:49]

nit: chromeos:: not needed?

[msw, 2016/10/14 21:07:43]

Done.

   }
 
   void BindRequest(app_list::mojom::AppListPresenterRequest request) {
@@ -140,7 +137,6 @@ class FactoryImpl {
   mojo::BindingSet<keyboard::mojom::Keyboard> keyboard_bindings_;
   std::unique_ptr<ChromeLaunchable> launchable_;
   mojo::BindingSet<ash::mojom::SystemTrayClient> system_tray_client_bindings_;
-  std::unique_ptr<ChromeWallpaperManager> wallpaper_manager_;
   std::unique_ptr<AppListPresenterService> app_list_presenter_service_;
   mojo::BindingSet<app_list::mojom::AppListPresenter>
       app_list_presenter_bindings_;