arc: enable use_new_wrapper_types for notifications.mojom

ui/arc/notification/arc_notification_manager.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_manager.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/common/system/toast/toast_manager.h"
 #include "ash/common/wm_shell.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "components/arc/arc_bridge_service.h"
 #include "mojo/common/common_type_converters.h"
 #include "ui/arc/notification/arc_custom_notification_item.h"
 #include "ui/arc/notification/arc_notification_item.h"
 
 namespace arc {
 
 namespace {
 
 // Min version to support Create/CloseNotificationWindow.
@@ skipping 61 matching lines @@
             : new ArcNotificationItem(this, message_center_, key,
                                       main_profile_id_);
     // TODO(yoshiki): Use emplacement for performance when it's available.
     auto result = items_.insert(std::make_pair(key, base::WrapUnique(item)));
     DCHECK(result.second);
     it = result.first;
   }
   it->second->UpdateWithArcNotificationData(std::move(data));
 }
 
-void ArcNotificationManager::OnNotificationRemoved(const mojo::String& key) {
-  auto it = items_.find(key.get());
+void ArcNotificationManager::OnNotificationRemoved(const std::string& key) {
+  auto it = items_.find(key);
   if (it == items_.end()) {
     VLOG(3) << "Android requests to remove a notification (key: " << key
             << "), but it is already gone.";
     return;
   }
 
   std::unique_ptr<ArcNotificationItem> item = std::move(it->second);
   items_.erase(it);
   item->OnClosedFromAndroid();
 }
@@ skipping 122 matching lines @@
   auto* notifications_instance =
       arc_bridge_service()->notifications()->GetInstanceForMethod(
           "CloseNotificationWindow", kMinVersionNotificationWindow);
   if (!notifications_instance)
     return;
 
   notifications_instance->CloseNotificationWindow(key);
 }
 
 void ArcNotificationManager::OnToastPosted(mojom::ArcToastDataPtr data) {
+  const base::string16 text16(
+      base::UTF8ToUTF16(data->text.has_value() ? *data->text : ""));

[Luis Héctor Chávez, 2016/11/15 19:22:59]

nit: s/""/std::string()/

[Yusuke Sato, 2016/11/15 19:27:35]

Done.

+  const base::string16 dismiss_text16(base::UTF8ToUTF16(
+      data->dismiss_text.has_value() ? *data->dismiss_text : ""));
   ash::WmShell::Get()->toast_manager()->Show(
-      ash::ToastData(data->id, data->text.To<base::string16>(), data->duration,
-                     data->dismiss_text.To<base::string16>()));
+      ash::ToastData(data->id, text16, data->duration, dismiss_text16));
 }
 
 void ArcNotificationManager::OnToastCancelled(mojom::ArcToastDataPtr data) {
   ash::WmShell::Get()->toast_manager()->Cancel(data->id);
 }
 
 }  // namespace arc