Index: content/child/resource_dispatcher_unittest.cc |
diff --git a/content/child/resource_dispatcher_unittest.cc b/content/child/resource_dispatcher_unittest.cc |
index e0938d1aad6c14cef3b412bd54adf016fbf8dd20..bd5e13d648a7ba7f7acfd9028123c550f02285f8 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()); |
} |