[Merge M59] arc: Prevent overwriting of the Chrome Play Store icon.

chrome/browser/notifications/arc_application_notifier_source_chromeos.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/notifications/arc_application_notifier_source_chromeos.h"
 
 #include <set>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 43 matching lines @@
     if (!package || package->system)
       continue;
 
     // Load icons for notifier.
     std::unique_ptr<ArcAppIcon> icon(
         new ArcAppIcon(profile, app_id,
                        // ARC icon is available only for 48x48 dips.
                        kArcAppIconSizeInDp,
                        // The life time of icon must shorter than |this|.
                        this));
-    icon->LoadForScaleFactor(
+    icon->image_skia().GetRepresentation(
         ui::GetSupportedScaleFactor(display::Screen::GetScreen()
                                         ->GetPrimaryDisplay()
                                         .device_scale_factor()));
+    // Apply icon now to set the default image.
+    OnIconUpdated(icon.get());
 
     // Add notifiers.
     package_to_app_ids_.insert(std::make_pair(app->package_name, app_id));
     message_center::NotifierId notifier_id(
         message_center::NotifierId::ARC_APPLICATION, app_id);
     std::unique_ptr<message_center::Notifier> notifier(
         new message_center::Notifier(notifier_id, base::UTF8ToUTF16(app->name),
                                      app->notifications_enabled));
-    notifier->icon = icon->image();
+    notifier->icon = gfx::Image(icon->image_skia());
     icons_.push_back(std::move(icon));
     results.push_back(std::move(notifier));
   }
 
   return results;
 }
 
 void ArcApplicationNotifierSourceChromeOS::SetNotifierEnabled(
     Profile* profile,
     const message_center::Notifier& notifier,
@@ skipping 23 matching lines @@
 
 message_center::NotifierId::NotifierType
 ArcApplicationNotifierSourceChromeOS::GetNotifierType() {
   return message_center::NotifierId::ARC_APPLICATION;
 }
 
 void ArcApplicationNotifierSourceChromeOS::OnIconUpdated(ArcAppIcon* icon) {
   observer_->OnIconImageUpdated(
       message_center::NotifierId(message_center::NotifierId::ARC_APPLICATION,
                                  icon->app_id()),
-      icon->image());
+      gfx::Image(icon->image_skia()));
 }
 
 void ArcApplicationNotifierSourceChromeOS::StopObserving() {
   if (!last_profile_)
     return;
   ArcAppListPrefs* const app_list = ArcAppListPrefs::Get(last_profile_);
   app_list->RemoveObserver(this);
   last_profile_ = nullptr;
 }
 
 }  // namespace arc