summaryrefslogtreecommitdiffstats
path: root/content/browser/resolve_proxy_msg_helper_unittest.cc
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-05-29 15:15:47 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-29 22:16:36 +0000
commitd5ca2bc110d2bcf78dbfafc8b4f8d69663594e77 (patch)
tree5e571190738d8545b83558db29f4856afbf53556 /content/browser/resolve_proxy_msg_helper_unittest.cc
parente124019512f944ad49114dea310531418d53ff7e (diff)
downloadchromium_src-d5ca2bc110d2bcf78dbfafc8b4f8d69663594e77.zip
chromium_src-d5ca2bc110d2bcf78dbfafc8b4f8d69663594e77.tar.gz
chromium_src-d5ca2bc110d2bcf78dbfafc8b4f8d69663594e77.tar.bz2
Move Tuple to base namespace.
Namespace change only, no functionality change. The only non-search-and-replace change is in generate_gmock_mutant.py which changes some line wrapping logic for the generated gmock_mutant header. NOPRESUBMIT=true (No presubmit due to long lines in the generated gmock_mutant.h header). R=sky Review URL: https://codereview.chromium.org/1159553007 Cr-Commit-Position: refs/heads/master@{#332058}
Diffstat (limited to 'content/browser/resolve_proxy_msg_helper_unittest.cc')
-rw-r--r--content/browser/resolve_proxy_msg_helper_unittest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/resolve_proxy_msg_helper_unittest.cc b/content/browser/resolve_proxy_msg_helper_unittest.cc
index c03545c4..9dab293 100644
--- a/content/browser/resolve_proxy_msg_helper_unittest.cc
+++ b/content/browser/resolve_proxy_msg_helper_unittest.cc
@@ -89,11 +89,12 @@ class ResolveProxyMsgHelperTest : public testing::Test, public IPC::Listener {
private:
bool OnMessageReceived(const IPC::Message& msg) override {
- TupleTypes<ViewHostMsg_ResolveProxy::ReplyParam>::ValueTuple reply_data;
+ base::TupleTypes<ViewHostMsg_ResolveProxy::ReplyParam>::ValueTuple
+ reply_data;
EXPECT_TRUE(ViewHostMsg_ResolveProxy::ReadReplyParam(&msg, &reply_data));
DCHECK(!pending_result_.get());
pending_result_.reset(
- new PendingResult(get<0>(reply_data), get<1>(reply_data)));
+ new PendingResult(base::get<0>(reply_data), base::get<1>(reply_data)));
test_sink_.ClearMessages();
return true;
}