diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-09 14:22:11 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-05-09 15:11:45 +0000 |
commit | 2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch) | |
tree | e75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/content/browser/resolve_proxy_msg_helper_unittest.cc | |
parent | a4f3d46271c57e8155ba912df46a05559d14726e (diff) | |
download | qtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz |
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion.
Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/content/browser/resolve_proxy_msg_helper_unittest.cc')
-rw-r--r-- | chromium/content/browser/resolve_proxy_msg_helper_unittest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chromium/content/browser/resolve_proxy_msg_helper_unittest.cc b/chromium/content/browser/resolve_proxy_msg_helper_unittest.cc index 5e3dd0de584..bc723fe8796 100644 --- a/chromium/content/browser/resolve_proxy_msg_helper_unittest.cc +++ b/chromium/content/browser/resolve_proxy_msg_helper_unittest.cc @@ -90,8 +90,7 @@ class ResolveProxyMsgHelperTest : public testing::Test, public IPC::Listener { private: bool OnMessageReceived(const IPC::Message& msg) override { - base::TupleTypes<ViewHostMsg_ResolveProxy::ReplyParam>::ValueTuple - reply_data; + ViewHostMsg_ResolveProxy::ReplyParam reply_data; EXPECT_TRUE(ViewHostMsg_ResolveProxy::ReadReplyParam(&msg, &reply_data)); DCHECK(!pending_result_.get()); pending_result_.reset( |