Remove mojo::Array.

chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc

 // Copyright (c) 2012 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/webui/omnibox/omnibox_page_handler.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 15 matching lines @@
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/url_database.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/omnibox/browser/autocomplete_controller.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_provider.h"
 #include "components/search_engines/template_url.h"
 #include "content/public/browser/web_ui.h"
-#include "mojo/common/common_type_converters.h"
 
 using bookmarks::BookmarkModel;
 
 namespace mojo {
 
 template <>
-struct TypeConverter<mojo::Array<mojom::AutocompleteAdditionalInfoPtr>,
+struct TypeConverter<std::vector<mojom::AutocompleteAdditionalInfoPtr>,
                      AutocompleteMatch::AdditionalInfo> {
-  static mojo::Array<mojom::AutocompleteAdditionalInfoPtr> Convert(
+  static std::vector<mojom::AutocompleteAdditionalInfoPtr> Convert(
       const AutocompleteMatch::AdditionalInfo& input) {
-    mojo::Array<mojom::AutocompleteAdditionalInfoPtr> array(input.size());
+    std::vector<mojom::AutocompleteAdditionalInfoPtr> array(input.size());
     size_t index = 0;
     for (AutocompleteMatch::AdditionalInfo::const_iterator i = input.begin();
          i != input.end(); ++i, index++) {
       mojom::AutocompleteAdditionalInfoPtr item(
           mojom::AutocompleteAdditionalInfo::New());
       item->key = i->first;
       item->value = i->second;
       array[index] = std::move(item);
     }
     return array;
@@ skipping 27 matching lines @@
     result->type = AutocompleteMatchType::ToString(input.type);
     if (input.associated_keyword.get() != NULL) {
       result->associated_keyword =
           base::UTF16ToUTF8(input.associated_keyword->keyword);
     }
     result->keyword = base::UTF16ToUTF8(input.keyword);
     result->duplicates = static_cast<int32_t>(input.duplicate_matches.size());
     result->from_previous = input.from_previous;
 
     result->additional_info =
-        mojo::Array<mojom::AutocompleteAdditionalInfoPtr>::From(
-            input.additional_info)
-            .PassStorage();
+        mojo::ConvertTo<std::vector<mojom::AutocompleteAdditionalInfoPtr>>(
+            input.additional_info);
     return result;
   }
 };
 
 template <>
 struct TypeConverter<mojom::AutocompleteResultsForProviderPtr,
                      scoped_refptr<AutocompleteProvider>> {
   static mojom::AutocompleteResultsForProviderPtr Convert(
       const scoped_refptr<AutocompleteProvider>& input) {
     mojom::AutocompleteResultsForProviderPtr result(
         mojom::AutocompleteResultsForProvider::New());
     result->provider_name = input->GetName();
-    result->results =
-        mojo::Array<mojom::AutocompleteMatchPtr>::From(input->matches())
-            .PassStorage();
+    result->results = mojo::ConvertTo<std::vector<mojom::AutocompleteMatchPtr>>(
+        input->matches());
     return result;
   }
 };
 
 }  // namespace mojo
 
 OmniboxPageHandler::OmniboxPageHandler(
     Profile* profile,
     mojo::InterfaceRequest<mojom::OmniboxPageHandler> request)
     : profile_(profile), binding_(this, std::move(request)) {
@@ skipping 14 matching lines @@
   if (!LookupIsTypedHost(host, &is_typed_host))
     is_typed_host = false;
   result->is_typed_host = is_typed_host;
 
   {
     // Copy to an ACMatches to make conversion easier. Since this isn't
     // performance critical we don't worry about the cost here.
     ACMatches matches(controller_->result().begin(),
                       controller_->result().end());
     result->combined_results =
-        mojo::Array<mojom::AutocompleteMatchPtr>::From(matches).PassStorage();
+        mojo::ConvertTo<std::vector<mojom::AutocompleteMatchPtr>>(matches);
   }
   result->results_by_provider =
-      mojo::Array<mojom::AutocompleteResultsForProviderPtr>::From(
-          controller_->providers())
-          .PassStorage();
+      mojo::ConvertTo<std::vector<mojom::AutocompleteResultsForProviderPtr>>(
+          controller_->providers());
 
   // Fill AutocompleteMatch::starred.
   BookmarkModel* bookmark_model =
       BookmarkModelFactory::GetForBrowserContext(profile_);
   if (bookmark_model) {
     for (size_t i = 0; i < result->combined_results.size(); ++i) {
       result->combined_results[i]->starred = bookmark_model->IsBookmarked(
           GURL(result->combined_results[i]->destination_url));
     }
     for (size_t i = 0; i < result->results_by_provider.size(); ++i) {
@@ skipping 46 matching lines @@
       prevent_inline_autocomplete, prefer_keyword, true, true, false,
       ChromeAutocompleteSchemeClassifier(profile_));
   controller_->Start(input_);
 }
 
 void OmniboxPageHandler::ResetController() {
   controller_.reset(new AutocompleteController(
       base::MakeUnique<ChromeAutocompleteProviderClient>(profile_), this,
       AutocompleteClassifier::kDefaultOmniboxProviders));
 }