summaryrefslogtreecommitdiffstats
path: root/content/child/resource_dispatcher_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/child/resource_dispatcher_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/child/resource_dispatcher_unittest.cc')
-rw-r--r--content/child/resource_dispatcher_unittest.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/content/child/resource_dispatcher_unittest.cc b/content/child/resource_dispatcher_unittest.cc
index e0938d1..bd5e13d 100644
--- a/content/child/resource_dispatcher_unittest.cc
+++ b/content/child/resource_dispatcher_unittest.cc
@@ -186,60 +186,60 @@ class ResourceDispatcherTest : public testing::Test, public IPC::Sender {
ADD_FAILURE() << "Expected ResourceHostMsg_RequestResource message";
return -1;
}
- ResourceHostMsg_Request request = get<2>(params);
+ ResourceHostMsg_Request request = base::get<2>(params);
EXPECT_EQ(kTestPageUrl, request.url.spec());
message_queue_.erase(message_queue_.begin());
- return get<1>(params);
+ return base::get<1>(params);
}
void ConsumeFollowRedirect(int expected_request_id) {
ASSERT_FALSE(message_queue_.empty());
- Tuple<int> args;
+ base::Tuple<int> args;
ASSERT_EQ(ResourceHostMsg_FollowRedirect::ID, message_queue_[0].type());
ASSERT_TRUE(ResourceHostMsg_FollowRedirect::Read(
&message_queue_[0], &args));
- EXPECT_EQ(expected_request_id, get<0>(args));
+ EXPECT_EQ(expected_request_id, base::get<0>(args));
message_queue_.erase(message_queue_.begin());
}
void ConsumeDataReceived_ACK(int expected_request_id) {
ASSERT_FALSE(message_queue_.empty());
- Tuple<int> args;
+ base::Tuple<int> args;
ASSERT_EQ(ResourceHostMsg_DataReceived_ACK::ID, message_queue_[0].type());
ASSERT_TRUE(ResourceHostMsg_DataReceived_ACK::Read(
&message_queue_[0], &args));
- EXPECT_EQ(expected_request_id, get<0>(args));
+ EXPECT_EQ(expected_request_id, base::get<0>(args));
message_queue_.erase(message_queue_.begin());
}
void ConsumeDataDownloaded_ACK(int expected_request_id) {
ASSERT_FALSE(message_queue_.empty());
- Tuple<int> args;
+ base::Tuple<int> args;
ASSERT_EQ(ResourceHostMsg_DataDownloaded_ACK::ID, message_queue_[0].type());
ASSERT_TRUE(ResourceHostMsg_DataDownloaded_ACK::Read(
&message_queue_[0], &args));
- EXPECT_EQ(expected_request_id, get<0>(args));
+ EXPECT_EQ(expected_request_id, base::get<0>(args));
message_queue_.erase(message_queue_.begin());
}
void ConsumeReleaseDownloadedFile(int expected_request_id) {
ASSERT_FALSE(message_queue_.empty());
- Tuple<int> args;
+ base::Tuple<int> args;
ASSERT_EQ(ResourceHostMsg_ReleaseDownloadedFile::ID,
message_queue_[0].type());
ASSERT_TRUE(ResourceHostMsg_ReleaseDownloadedFile::Read(
&message_queue_[0], &args));
- EXPECT_EQ(expected_request_id, get<0>(args));
+ EXPECT_EQ(expected_request_id, base::get<0>(args));
message_queue_.erase(message_queue_.begin());
}
void ConsumeCancelRequest(int expected_request_id) {
ASSERT_FALSE(message_queue_.empty());
- Tuple<int> args;
+ base::Tuple<int> args;
ASSERT_EQ(ResourceHostMsg_CancelRequest::ID, message_queue_[0].type());
ASSERT_TRUE(ResourceHostMsg_CancelRequest::Read(
&message_queue_[0], &args));
- EXPECT_EQ(expected_request_id, get<0>(args));
+ EXPECT_EQ(expected_request_id, base::get<0>(args));
message_queue_.erase(message_queue_.begin());
}