arc: enable use_new_wrapper_types for intent_helper.mojom

components/arc/intent_helper/link_handler_model_impl.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 "components/arc/intent_helper/link_handler_model_impl.h"
 
 #include <string>
 #include <utility>
 #include <vector>

[Luis Héctor Chávez, 2016/11/16 03:22:02]

nit: remove?

[Yusuke Sato, 2016/11/16 06:10:21]

Done.

 
 #include "base/bind.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
 #include "components/google/core/browser/google_util.h"
 #include "url/gurl.h"
 #include "url/url_util.h"
 
 namespace arc {
 
@@ skipping 62 matching lines @@
       "HandleUrl", kMinInstanceVersion);
   if (!instance)
     return;
   if (handler_id >= handlers_.size())
     return;
   const GURL rewritten(RewriteUrlFromQueryIfAvailable(url));
   instance->HandleUrl(rewritten.spec(), handlers_[handler_id]->package_name);
 }
 
 void LinkHandlerModelImpl::OnUrlHandlerList(
-    mojo::Array<mojom::IntentHandlerInfoPtr> handlers) {
+    std::vector<mojom::IntentHandlerInfoPtr> handlers) {
   handlers_ = ArcIntentHelperBridge::FilterOutIntentHelper(std::move(handlers));
 
   bool icon_info_notified = false;
   if (icon_loader_) {
     std::vector<ActivityIconLoader::ActivityName> activities;
     for (size_t i = 0; i < handlers_.size(); ++i) {
       activities.emplace_back(handlers_[i]->package_name,
                               handlers_[i]->activity_name);
     }
     const ActivityIconLoader::GetResult result = icon_loader_->GetActivityIcons(
@@ skipping 19 matching lines @@
 
   std::vector<ash::LinkHandlerInfo> handlers;
   for (size_t i = 0; i < handlers_.size(); ++i) {
     gfx::Image icon;
     const ActivityIconLoader::ActivityName activity(
         handlers_[i]->package_name, handlers_[i]->activity_name);
     const auto it = icons_.find(activity);
     if (it != icons_.end())
       icon = it->second.icon16;
     // Use the handler's index as an ID.
-    ash::LinkHandlerInfo handler = {handlers_[i]->name.get(), icon, i};
+    ash::LinkHandlerInfo handler = {handlers_[i]->name, icon, i};
     handlers.push_back(handler);
   }
   for (auto& observer : observer_list_)
     observer.ModelChanged(handlers);
 }
 
 // static
 GURL LinkHandlerModelImpl::RewriteUrlFromQueryIfAvailableForTesting(
     const GURL& url) {
   return RewriteUrlFromQueryIfAvailable(url);
@@ skipping 15 matching lines @@
   if (!GetQueryValue(url, kKeyToFind, &value))
     return url;
 
   const GURL new_url(value);
   if (!new_url.is_valid())
     return url;
   return new_url;
 }
 
 }  // namespace arc