summaryrefslogtreecommitdiffstats
path: root/chromium/net/proxy/proxy_resolver_v8_tracing_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/net/proxy/proxy_resolver_v8_tracing_unittest.cc')
-rw-r--r--chromium/net/proxy/proxy_resolver_v8_tracing_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/net/proxy/proxy_resolver_v8_tracing_unittest.cc b/chromium/net/proxy/proxy_resolver_v8_tracing_unittest.cc
index 805a8734365..5cad3a21b10 100644
--- a/chromium/net/proxy/proxy_resolver_v8_tracing_unittest.cc
+++ b/chromium/net/proxy/proxy_resolver_v8_tracing_unittest.cc
@@ -75,7 +75,7 @@ class MockErrorObserver : public ProxyResolverErrorObserver {
{
base::AutoLock l(lock_);
output += base::StringPrintf("Error: line %d: %s\n", line_number,
- UTF16ToASCII(error).c_str());
+ base::UTF16ToASCII(error).c_str());
}
event_.Signal();
}
@@ -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());
}
}