| Index: android_webview/native/aw_web_contents_delegate.cc
|
| diff --git a/android_webview/native/aw_web_contents_delegate.cc b/android_webview/native/aw_web_contents_delegate.cc
|
| index 9588586b41954fd8830a0ca5bea50fb1a71da91e..9f397a8a65fb10c3fe3f00ca0d6ea03183f44a97 100644
|
| --- a/android_webview/native/aw_web_contents_delegate.cc
|
| +++ b/android_webview/native/aw_web_contents_delegate.cc
|
| @@ -116,17 +116,15 @@ void AwWebContentsDelegate::RunFileChooser(
|
| DCHECK_EQ(FileChooserParams::Open, params.mode);
|
| }
|
| Java_AwWebContentsDelegate_runFileChooser(
|
| - env, java_delegate.obj(), render_frame_host->GetProcess()->GetID(),
|
| + env, java_delegate, render_frame_host->GetProcess()->GetID(),
|
| render_frame_host->GetRoutingID(), mode_flags,
|
| ConvertUTF16ToJavaString(
|
| - env, base::JoinString(params.accept_types, base::ASCIIToUTF16(",")))
|
| - .obj(),
|
| - params.title.empty() ? NULL
|
| - : ConvertUTF16ToJavaString(env, params.title).obj(),
|
| + env, base::JoinString(params.accept_types, base::ASCIIToUTF16(","))),
|
| + params.title.empty() ? nullptr
|
| + : ConvertUTF16ToJavaString(env, params.title),
|
| params.default_file_name.empty()
|
| - ? NULL
|
| - : ConvertUTF8ToJavaString(env, params.default_file_name.value())
|
| - .obj(),
|
| + ? nullptr
|
| + : ConvertUTF8ToJavaString(env, params.default_file_name.value()),
|
| params.capture);
|
| }
|
|
|
|
|