diff options
| author | Ben Murdoch <benm@google.com> | 2016-06-15 10:48:10 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2016-06-15 10:48:10 +0100 |
| commit | 85d9db291ccbab056b33e3d59e2d8fe653c2cead (patch) | |
| tree | dab604f33b88f8f781ca2230b38dc96cea7180b5 | |
| parent | 47ec0dd99ad4c4472cdff9d8c6e07998aa3c0e09 (diff) | |
| download | chromium-libpac-marshmallow-dr-arc-dev.tar.gz | |
Fix merge from mnc-dr-devmarshmallow-dr-arc-m54marshmallow-dr-arc-m53marshmallow-dr-arc-dev
Change-Id: I62c8c4ef7b3f62d72242b82c72010e22c5129f4c
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | src/proxy_resolver_v8.cc | 1 | ||||
| -rw-r--r-- | test/js-unittest/bindings.js | 12 | ||||
| -rw-r--r-- | test/proxy_test_script.h | 12 |
4 files changed, 14 insertions, 13 deletions
@@ -19,7 +19,7 @@ LOCAL_CFLAGS += \ -Wno-format \ -Wno-unused-parameter \ -LOCAL_C_INCLUDES += $(LOCAL_PATH)/src +LOCAL_C_INCLUDES += $(LOCAL_PATH)/src $(LOCAL_PATH)/../v8 LOCAL_STATIC_LIBRARIES := libv8 diff --git a/src/proxy_resolver_v8.cc b/src/proxy_resolver_v8.cc index 6530768..f978694 100644 --- a/src/proxy_resolver_v8.cc +++ b/src/proxy_resolver_v8.cc @@ -10,6 +10,7 @@ #include <string> #include <utils/String8.h> #include <v8.h> +#include <libplatform/libplatform.h> #include <vector> #include "net_util.h" diff --git a/test/js-unittest/bindings.js b/test/js-unittest/bindings.js index 7cf9f26..995ad2b 100644 --- a/test/js-unittest/bindings.js +++ b/test/js-unittest/bindings.js @@ -21,13 +21,13 @@ function FindProxyForURL(url, host) { // Those expected to fail (because we have passed a non-string parameter) // will return |null|, whereas those that have called through to the C++ // bindings will return '127.0.0.1'. - expectEquals(null, dnsResolve()); - expectEquals(null, dnsResolve(null)); - expectEquals(null, dnsResolve(undefined)); + expectEquals(undefined, dnsResolve()); + expectEquals(undefined, dnsResolve(null)); + expectEquals(undefined, dnsResolve(undefined)); expectEquals('127.0.0.1', dnsResolve("")); - expectEquals(null, dnsResolve({foo: 'bar'})); - expectEquals(null, dnsResolve(fn)); - expectEquals(null, dnsResolve(['3'])); + expectEquals(undefined, dnsResolve({foo: 'bar'})); + expectEquals(undefined, dnsResolve(fn)); + expectEquals(undefined, dnsResolve(['3'])); expectEquals('127.0.0.1', dnsResolve("arg1", "arg2", "arg3", "arg4")); // Call alert with some wonky arguments. diff --git a/test/proxy_test_script.h b/test/proxy_test_script.h index 88af872..1042366 100644 --- a/test/proxy_test_script.h +++ b/test/proxy_test_script.h @@ -38,13 +38,13 @@ " // Those expected to fail (because we have passed a non-string parameter)\n" \ " // will return |null|, whereas those that have called through to the C++\n" \ " // bindings will return '127.0.0.1'.\n" \ - " expectEquals(null, dnsResolve());\n" \ - " expectEquals(null, dnsResolve(null));\n" \ - " expectEquals(null, dnsResolve(undefined));\n" \ + " expectEquals(undefined, dnsResolve());\n" \ + " expectEquals(undefined, dnsResolve(null));\n" \ + " expectEquals(undefined, dnsResolve(undefined));\n" \ " expectEquals('127.0.0.1', dnsResolve(\"\"));\n" \ - " expectEquals(null, dnsResolve({foo: 'bar'}));\n" \ - " expectEquals(null, dnsResolve(fn));\n" \ - " expectEquals(null, dnsResolve(['3']));\n" \ + " expectEquals(undefined, dnsResolve({foo: 'bar'}));\n" \ + " expectEquals(undefined, dnsResolve(fn));\n" \ + " expectEquals(undefined, dnsResolve(['3']));\n" \ " expectEquals('127.0.0.1', dnsResolve(\"arg1\", \"arg2\", \"arg3\", \"arg4\"));\n" \ "\n" \ " // Call alert with some wonky arguments.\n" \ |