[Autofill] Switch on use_new_wrapper_types mode.

components/autofill/content/browser/content_autofill_driver.cc

 // Copyright 2014 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/autofill/content/browser/content_autofill_driver.h"
 
 #include <utility>
 
 #include "base/command_line.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/autofill/content/browser/content_autofill_driver_factory.h"
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/core/browser/autofill_client.h"
 #include "components/autofill/core/browser/autofill_external_delegate.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
-#include "mojo/common/common_type_converters.h"
 #include "services/shell/public/cpp/interface_provider.h"
 #include "ui/gfx/geometry/size_f.h"
 
 namespace autofill {
 
 ContentAutofillDriver::ContentAutofillDriver(
     content::RenderFrameHost* render_frame_host,
     AutofillClient* client,
     const std::string& app_locale,
     AutofillManager::AutofillDownloadManagerState enable_download_manager)
@@ skipping 70 matching lines @@
     const std::vector<FormStructure*>& forms) {
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kShowAutofillTypePredictions))
     return;
 
   if (!RendererIsAvailable())
     return;
 
   std::vector<FormDataPredictions> type_predictions =
       FormStructure::GetFieldTypePredictions(forms);
-  GetAutofillAgent()->FieldTypePredictionsAvailable(
-      std::move(type_predictions));
+  GetAutofillAgent()->FieldTypePredictionsAvailable(type_predictions);
 }
 
 void ContentAutofillDriver::RendererShouldAcceptDataListSuggestion(
     const base::string16& value) {
   if (!RendererIsAvailable())
     return;
-  GetAutofillAgent()->AcceptDataListSuggestion(mojo::String::From(value));
+  GetAutofillAgent()->AcceptDataListSuggestion(base::UTF16ToUTF8(value));
 }
 
 void ContentAutofillDriver::RendererShouldClearFilledForm() {
   if (!RendererIsAvailable())
     return;
   GetAutofillAgent()->ClearForm();
 }
 
 void ContentAutofillDriver::RendererShouldClearPreviewedForm() {
   if (!RendererIsAvailable())
     return;
   GetAutofillAgent()->ClearPreviewedForm();
 }
 
 void ContentAutofillDriver::RendererShouldFillFieldWithValue(
     const base::string16& value) {
   if (!RendererIsAvailable())
     return;
-  GetAutofillAgent()->FillFieldWithValue(mojo::String::From(value));
+  GetAutofillAgent()->FillFieldWithValue(base::UTF16ToUTF8(value));
 }
 
 void ContentAutofillDriver::RendererShouldPreviewFieldWithValue(
     const base::string16& value) {
   if (!RendererIsAvailable())
     return;
-  GetAutofillAgent()->PreviewFieldWithValue(mojo::String::From(value));
+  GetAutofillAgent()->PreviewFieldWithValue(base::UTF16ToUTF8(value));
 }
 
 void ContentAutofillDriver::PopupHidden() {
   // If the unmask prompt is showing, keep showing the preview. The preview
   // will be cleared when the prompt closes.
   if (!autofill_manager_->IsShowingUnmaskPrompt())
     RendererShouldClearPreviewedForm();
 }
 
 gfx::RectF ContentAutofillDriver::TransformBoundingBoxToViewportCoordinates(
     const gfx::RectF& bounding_box) {
   gfx::Point orig_point(bounding_box.x(), bounding_box.y());
   gfx::Point transformed_point;
   transformed_point =
       render_frame_host_->GetView()->TransformPointToRootCoordSpace(orig_point);
 
   gfx::RectF new_box;
   new_box.SetRect(transformed_point.x(), transformed_point.y(),
                   bounding_box.width(), bounding_box.height());
   return new_box;
 }
 
 // mojom::AutofillDriver:
 void ContentAutofillDriver::FirstUserGestureObserved() {
   client_->OnFirstUserGestureObserved();
 }
 
-void ContentAutofillDriver::FormsSeen(mojo::Array<FormData> forms,
+void ContentAutofillDriver::FormsSeen(const std::vector<FormData>& forms,
                                       base::TimeTicks timestamp) {
-  autofill_manager_->OnFormsSeen(forms.storage(), timestamp);
+  autofill_manager_->OnFormsSeen(forms, timestamp);
 }
 
 void ContentAutofillDriver::WillSubmitForm(const FormData& form,
                                            base::TimeTicks timestamp) {
   autofill_manager_->OnWillSubmitForm(form, timestamp);
 }
 
 void ContentAutofillDriver::FormSubmitted(const FormData& form) {
   autofill_manager_->OnFormSubmitted(form);
 }
@@ skipping 30 matching lines @@
 }
 
 void ContentAutofillDriver::DidPreviewAutofillFormData() {
   autofill_manager_->OnDidPreviewAutofillFormData();
 }
 
 void ContentAutofillDriver::DidEndTextFieldEditing() {
   autofill_manager_->OnDidEndTextFieldEditing();
 }
 
-void ContentAutofillDriver::SetDataList(mojo::Array<mojo::String> values,
-                                        mojo::Array<mojo::String> labels) {
-  autofill_manager_->OnSetDataList(values.To<std::vector<base::string16>>(),
-                                   labels.To<std::vector<base::string16>>());
+void ContentAutofillDriver::SetDataList(
+    const std::vector<std::string>& values,
+    const std::vector<std::string>& labels) {
+  std::vector<base::string16> values16;

[yzshen1, 2016/07/26 16:45:36]

nit: please reserve the same size as |values| to avoid re-allocation.


Btw, looking at all these changes, it makes me wonder whether we should define a
custom type map for base::string16, instead of using mojom built-in string type.
WDYT?

[leonhsl(Using Gerrit), 2016/07/27 02:50:26]

Yeah, I have the same feeling.. Seems lots of interface definitions need a
base::string16 as parameter. How about we create the typemap at
mojo/common/common_custom_types.typemap? If you agree, I'll implement within
this CL.

[yzshen1, 2016/07/27 06:21:20]

SGTM Thanks!

[leonhsl(Using Gerrit), 2016/07/27 09:25:32]

Done. Use base::string16 typemap now, removed these conversion codes.

+  for (const auto& i : values)
+    values16.emplace_back(base::UTF8ToUTF16(i));
+  std::vector<base::string16> labels16;

[yzshen1, 2016/07/26 16:45:36]

ditto

[leonhsl(Using Gerrit), 2016/07/27 02:50:26]

Acknowledged.

[leonhsl(Using Gerrit), 2016/07/27 09:25:32]

Done. Use base::string16 typemap now, removed these conversion codes.

+  for (const auto& i : labels)
+    labels16.emplace_back(base::UTF8ToUTF16(i));
+  autofill_manager_->OnSetDataList(values16, labels16);
 }
 
 void ContentAutofillDriver::DidNavigateFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   if (details.is_navigation_to_different_page())
     autofill_manager_->Reset();
 }
 
 void ContentAutofillDriver::SetAutofillManager(
@@ skipping 10 matching lines @@
   // Here is a lazy binding, and will not reconnect after connection error.
   if (!mojo_autofill_agent_) {
     render_frame_host_->GetRemoteInterfaces()->GetInterface(
         mojo::GetProxy(&mojo_autofill_agent_));
   }
 
   return mojo_autofill_agent_;
 }
 
 }  // namespace autofill