Add SkBitmap StructTraits for skia::mojo::Bitmap.

chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.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 "chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h"
 
 #include "chrome/browser/extensions/extension_app_icon_loader.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "chrome/grit/theme_resources.h"
 #include "content/public/common/mojo_shell_connection.h"
 #include "extensions/common/constants.h"
 #include "extensions/grit/extensions_browser_resources.h"
 #include "mojo/common/common_type_converters.h"
 #include "services/shell/public/cpp/connector.h"
-#include "skia/public/type_converters.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
 class ChromeShelfItemDelegate : public mash::shelf::mojom::ShelfItemDelegate {
  public:
   explicit ChromeShelfItemDelegate(const std::string& app_id)
       : app_id_(app_id), item_delegate_binding_(this) {}
   ~ChromeShelfItemDelegate() override {}
 
@@ skipping 88 matching lines @@
 
   for (const auto& app : pinned_apps) {
     if (app == ash::kPinnedAppsPlaceholder)
       continue;
 
     mash::shelf::mojom::ShelfItemPtr item(mash::shelf::mojom::ShelfItem::New());
     item->app_id = app;
     item->app_title = mojo::String::From(helper_.GetAppTitle(profile, app));
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     const gfx::Image& image = rb.GetImageNamed(IDR_APP_DEFAULT_ICON);
-    item->image = skia::mojom::Bitmap::From(*image.ToSkBitmap());
+    item->image = *image.ToSkBitmap();
     std::unique_ptr<ChromeShelfItemDelegate> delegate(
         new ChromeShelfItemDelegate(app));
     shelf_controller_->PinItem(std::move(item),
                                delegate->CreateInterfacePtrInfoAndBind(
                                    shelf_controller_.associated_group()));
     app_id_to_item_delegate_.insert(std::make_pair(app, std::move(delegate)));
 
     AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app);
     if (app_icon_loader) {
       app_icon_loader->FetchImage(app);
@@ skipping 23 matching lines @@
 void ChromeMashShelfController::OnAutoHideBehaviorChanged(
     mash::shelf::mojom::AutoHideBehavior auto_hide) {
   ash::SetShelfAutoHideBehaviorPref(
       ProfileManager::GetActiveUserProfile()->GetPrefs(),
       display::Screen::GetScreen()->GetPrimaryDisplay().id(),
       static_cast<ash::ShelfAutoHideBehavior>(auto_hide));
 }
 
 void ChromeMashShelfController::OnAppImageUpdated(const std::string& app_id,
                                                   const gfx::ImageSkia& image) {
-  shelf_controller_->SetItemImage(app_id,
-                                  skia::mojom::Bitmap::From(*image.bitmap()));
+  shelf_controller_->SetItemImage(app_id, *image.bitmap());
 }