diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-13 15:05:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-14 10:33:47 +0000 |
| commit | e684a3455bcc29a6e3e66a004e352dea4e1141e7 (patch) | |
| tree | d55b4003bde34d7d05f558f02cfd82b2a66a7aac /chromium/net/android/network_library.cc | |
| parent | 2b94bfe47ccb6c08047959d1c26e392919550e86 (diff) | |
| download | qtwebengine-chromium-e684a3455bcc29a6e3e66a004e352dea4e1141e7.tar.gz | |
BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0
Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/android/network_library.cc')
| -rw-r--r-- | chromium/net/android/network_library.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chromium/net/android/network_library.cc b/chromium/net/android/network_library.cc index bc6fe9acfc9..818565d7d26 100644 --- a/chromium/net/android/network_library.cc +++ b/chromium/net/android/network_library.cc @@ -10,7 +10,7 @@ #include "base/android/scoped_java_ref.h" #include "base/logging.h" #include "jni/AndroidNetworkLibrary_jni.h" -#include "net/dns/dns_protocol.h" +#include "net/dns/public/dns_protocol.h" using base::android::AttachCurrentThread; using base::android::ConvertJavaStringToUTF8; @@ -128,8 +128,7 @@ internal::ConfigParsePosixResult GetDnsServers( JNIEnv* env = AttachCurrentThread(); std::vector<std::string> dns_servers_strings; base::android::JavaArrayOfByteArrayToStringVector( - env, Java_AndroidNetworkLibrary_getDnsServers(env).obj(), - &dns_servers_strings); + env, Java_AndroidNetworkLibrary_getDnsServers(env), &dns_servers_strings); if (dns_servers_strings.size() == 0) return internal::CONFIG_PARSE_POSIX_NO_NAMESERVERS; if (dns_servers_strings.size() == 1 && dns_servers_strings[0].size() == 1) |