mash: Have chrome set itself as the wallpaper picker.

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 
 #include <utility>
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/wallpaper/wallpaper_controller.h"
@@ skipping 351 matching lines @@
   return wallpaper_manager;
 }
 
 // static
 void WallpaperManager::Shutdown() {
   CHECK(wallpaper_manager);
   delete wallpaper_manager;
   wallpaper_manager = nullptr;
 }
 
-void WallpaperManager::BindRequest(
-    ash::mojom::WallpaperManagerRequest request) {
-  bindings_.AddBinding(this, std::move(request));
-}
-
 WallpaperManager::WallpaperResolution
 WallpaperManager::GetAppropriateResolution() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   gfx::Size size = ash::WallpaperController::GetMaxDisplaySizeInNative();
   return (size.width() > wallpaper::kSmallWallpaperMaxWidth ||
           size.height() > wallpaper::kSmallWallpaperMaxHeight)
              ? WALLPAPER_RESOLUTION_LARGE
              : WALLPAPER_RESOLUTION_SMALL;
 }
 
@@ skipping 413 matching lines @@
   // be set. It could result a black screen on external monitors.
   // See http://crbug.com/265689 for detail.
   if (last_selected_user_.empty())
     SetDefaultWallpaperNow(user_manager::SignInAccountId());
   WallpaperManagerBase::UpdateWallpaper(clear_cache);
 }
 
 // WallpaperManager, private: --------------------------------------------------
 
 WallpaperManager::WallpaperManager()
-    : pending_inactive_(NULL), weak_factory_(this) {
+    : binding_(this), pending_inactive_(nullptr), weak_factory_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   wallpaper::WallpaperManagerBase::SetPathIds(
       chrome::DIR_USER_DATA, chrome::DIR_CHROMEOS_WALLPAPERS,
       chrome::DIR_CHROMEOS_CUSTOM_WALLPAPERS);
   SetDefaultWallpaperPathsFromCommandLine(
       base::CommandLine::ForCurrentProcess());
   registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_CHANGED,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED,
                  content::NotificationService::AllSources());
   sequence_token_ = BrowserThread::GetBlockingPool()->GetNamedSequenceToken(
       wallpaper::kWallpaperSequenceTokenName);
   task_runner_ =
       BrowserThread::GetBlockingPool()
           ->GetSequencedTaskRunnerWithShutdownBehavior(
               sequence_token_, base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN);
 
   user_manager::UserManager::Get()->AddSessionStateObserver(this);
+
+  content::ServiceManagerConnection* connection =
+      content::ServiceManagerConnection::GetForProcess();
+  if (connection && connection->GetConnector()) {

[James Cook, 2016/12/07 23:03:47]

Are you sure these can be null? Is that in tests?

I've written code that doesn't test for null for these... now I'm worried about
my code.

[msw, 2016/12/07 23:12:55]

Yes, the earlier patch sets failed because the connection is null; I verified
that locally. I think the potential for null is dependent upon the testing
conditions. This object is constructed in unit tests that don't initialize the
connection, but other connection users may not be invoked in such tests...

+    // Connect to the wallpaper controller interface in the ash service.
+    ash::mojom::WallpaperControllerPtr wallpaper_controller_ptr;
+    connection->GetConnector()->ConnectToInterface(
+        ash_util::GetAshServiceName(), &wallpaper_controller_ptr);
+    // Register this object as the wallpaper picker.
+    wallpaper_controller_ptr->SetWallpaperPicker(
+        binding_.CreateInterfacePtrAndBind());
+  }
 }
 
 WallpaperManager::PendingWallpaper* WallpaperManager::GetPendingWallpaper(
     const AccountId& account_id,
     bool delayed) {
   if (!pending_inactive_) {
     loading_.push_back(new WallpaperManager::PendingWallpaper(
         (delayed ? GetWallpaperLoadDelay()
                  : base::TimeDelta::FromMilliseconds(0)),
         account_id));
@@ skipping 315 matching lines @@
                                               &stored_value)) {
     return wallpaper::WallpaperFilesId::FromString(stored_value);
   }
   const std::string& old_id = account_id.GetUserEmail();  // Migrated
   const wallpaper::WallpaperFilesId files_id = HashWallpaperFilesIdStr(old_id);
   SetKnownUserWallpaperFilesId(account_id, files_id);
   return files_id;
 }
 
 }  // namespace chromeos