arc: enable use_new_wrapper_types for notifications.mojom

ui/arc/notification/arc_notification_item.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 "ui/arc/notification/arc_notification_item.h"
 
 #include <algorithm>
+#include <utility>
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/threading/worker_pool.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
@@ skipping 134 matching lines @@
   message_center::RichNotificationData rich_data;
   message_center::NotificationType type;
 
   switch (data->type) {
     case mojom::ArcNotificationType::BASIC:
       type = message_center::NOTIFICATION_TYPE_BASE_FORMAT;
       break;
     case mojom::ArcNotificationType::LIST:
       type = message_center::NOTIFICATION_TYPE_MULTIPLE;
 
-      if (data->texts.is_null())
+      if (!data->texts.has_value())
         break;
 
       for (size_t i = 0;
-           i < std::min(data->texts.size(),
+           i < std::min(data->texts->size(),
                         message_center::kNotificationMaximumItems - 1);
            i++) {
-        rich_data.items.emplace_back(
-            base::string16(), base::UTF8ToUTF16(data->texts.at(i).get()));
+        rich_data.items.emplace_back(base::string16(),
+                                     base::UTF8ToUTF16(data->texts->at(i)));
       }
 
-      if (data->texts.size() > message_center::kNotificationMaximumItems) {
+      if (data->texts->size() > message_center::kNotificationMaximumItems) {
         // Show an elipsis as the 5th item if there are more than 5 items.
         rich_data.items.emplace_back(base::string16(), gfx::kEllipsisUTF16);
-      } else if (data->texts.size() ==
+      } else if (data->texts->size() ==
                  message_center::kNotificationMaximumItems) {
         // Show the 5th item if there are exact 5 items.
         rich_data.items.emplace_back(
             base::string16(),
-            base::UTF8ToUTF16(data->texts.at(data->texts.size() - 1).get()));
+            base::UTF8ToUTF16(data->texts->at(data->texts->size() - 1)));
       }
       break;
     case mojom::ArcNotificationType::IMAGE:
       type = message_center::NOTIFICATION_TYPE_IMAGE;
 
       if (data->big_picture && !data->big_picture->isNull()) {
         rich_data.image = gfx::Image::CreateFrom1xBitmap(
             CropImage(*data->big_picture));
       }
       break;
     case mojom::ArcNotificationType::PROGRESS:
       type = message_center::NOTIFICATION_TYPE_PROGRESS;
       rich_data.timestamp = base::Time::UnixEpoch() +
                             base::TimeDelta::FromMilliseconds(data->time);
       rich_data.progress = std::max(
           0, std::min(100, static_cast<int>(std::round(
                                static_cast<float>(data->progress_current) /
                                data->progress_max * 100))));
       break;
   }
   DCHECK(IsKnownEnumValue(data->type)) << "Unsupported notification type: "
                                       << data->type;
 
   for (size_t i = 0; i < data->buttons.size(); i++) {
     rich_data.buttons.emplace_back(
-        base::UTF8ToUTF16(data->buttons.at(i)->label.get()));
+        base::UTF8ToUTF16(data->buttons.at(i)->label));
   }
 
   // If the client is old (version < 1), both |no_clear| and |ongoing_event|
   // are false.
   rich_data.pinned = (data->no_clear || data->ongoing_event);
 
   rich_data.priority = ConvertAndroidPriority(data->priority);
   if (data->small_icon)
     rich_data.small_image = gfx::Image::CreateFrom1xBitmap(*data->small_icon);
 
   // The identifier of the notifier, which is used to distinguish the notifiers
   // in the message center.
   message_center::NotifierId notifier_id(
       message_center::NotifierId::SYSTEM_COMPONENT, kNotifierId);
   notifier_id.profile_id = profile_id_.GetUserEmail();
 
-  DCHECK(!data->title.is_null());
-  DCHECK(!data->message.is_null());
   SetNotification(base::MakeUnique<message_center::Notification>(
-      type, notification_id_, base::UTF8ToUTF16(data->title.get()),
-      base::UTF8ToUTF16(data->message.get()),
+      type, notification_id_, base::UTF8ToUTF16(data->title),
+      base::UTF8ToUTF16(data->message),
       gfx::Image(),              // icon image: Will be overriden later.
       base::UTF8ToUTF16("arc"),  // display source
       GURL(),                    // empty origin url, for system component
       notifier_id, rich_data,
       new ArcNotificationDelegate(weak_ptr_factory_.GetWeakPtr())));
 
-  DCHECK(!data->icon_data.is_null());

[Yusuke Sato, 2016/11/15 19:19:17]

same

   if (data->icon_data.size() == 0) {
     OnImageDecoded(SkBitmap());  // Pass an empty bitmap.
     return;
   }
 
   // TODO(yoshiki): Remove decoding by passing a bitmap directly from Android.
   base::PostTaskAndReplyWithResult(
       base::WorkerPool::GetTaskRunner(true).get(), FROM_HERE,
-      base::Bind(&DecodeImage, data->icon_data.storage()),
+      base::Bind(&DecodeImage, data->icon_data),
       base::Bind(&ArcNotificationItem::OnImageDecoded,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 ArcNotificationItem::~ArcNotificationItem() {}
 
 void ArcNotificationItem::OnClosedFromAndroid() {
   being_removed_by_manager_ = true;  // Closing is initiated by the manager.
   message_center_->RemoveNotification(notification_id_, false /* by_user */);
 }
@@ skipping 73 matching lines @@
 
 void ArcNotificationItem::OnImageDecoded(const SkBitmap& bitmap) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   gfx::Image image = gfx::Image::CreateFrom1xBitmap(bitmap);
   notification_->set_icon(image);
   AddToMessageCenter();
 }
 
 }  // namespace arc