summaryrefslogtreecommitdiffstats
path: root/net/proxy
diff options
context:
space:
mode:
authormachenbach@chromium.org <machenbach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-03 17:37:16 +0000
committermachenbach@chromium.org <machenbach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-03 17:37:16 +0000
commit05150b91625f0a39e1164a217c7474d3eeaa89df (patch)
tree9011d289f0959c13bcd1655e7a4f3a33ce8442b9 /net/proxy
parentc38cff44a47f678363cfc11e8b809f850ecad92a (diff)
downloadchromium_src-05150b91625f0a39e1164a217c7474d3eeaa89df.zip
chromium_src-05150b91625f0a39e1164a217c7474d3eeaa89df.tar.gz
chromium_src-05150b91625f0a39e1164a217c7474d3eeaa89df.tar.bz2
Update V8 to version 3.24.30.1 (based on bleeding_edge revision r19017).
Includes test expectation changes for changed V8 compiler message. TBR=hpayer@chromium.org BUG= Review URL: https://codereview.chromium.org/132913010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
-rw-r--r--net/proxy/proxy_resolver_v8_tracing_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/proxy/proxy_resolver_v8_tracing_unittest.cc b/net/proxy/proxy_resolver_v8_tracing_unittest.cc
index 805a8734..c0bd779 100644
--- a/net/proxy/proxy_resolver_v8_tracing_unittest.cc
+++ b/net/proxy/proxy_resolver_v8_tracing_unittest.cc
@@ -148,7 +148,7 @@ TEST_F(ProxyResolverV8TracingTest, JavascriptError) {
EXPECT_EQ(0u, host_resolver.num_resolve());
- EXPECT_EQ("Error: line 5: Uncaught TypeError: Cannot call method 'split' "
+ EXPECT_EQ("Error: line 5: Uncaught TypeError: Cannot read property 'split' "
"of null\n", error_observer->GetOutput());
// Check the NetLogs -- there was 1 alert and 1 javascript error, and they
@@ -169,7 +169,7 @@ TEST_F(ProxyResolverV8TracingTest, JavascriptError) {
EXPECT_EQ("{\"message\":\"Prepare to DIE!\"}", entries[0].GetParamsJson());
EXPECT_EQ("{\"line_number\":5,\"message\":\"Uncaught TypeError: Cannot "
- "call method 'split' of null\"}", entries[1].GetParamsJson());
+ "read property 'split' of null\"}", entries[1].GetParamsJson());
}
}