Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2076)

Unified Diff: content/public/test/browser_test_utils.cc

Issue 2023243002: Remove base::Tuple (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: lint fix Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/public/test/browser_test_utils.cc
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
index d9f017d5bcf06773d42d2fca00488d487326b728..48fd0ef04e9498177516f61a67e776451a4aca57 100644
--- a/content/public/test/browser_test_utils.cc
+++ b/content/public/test/browser_test_utils.cc
@@ -5,6 +5,7 @@
#include "content/public/test/browser_test_utils.h"
#include <stddef.h>
+#include <tuple>
#include <utility>
#include "base/auto_reset.h"
@@ -1151,7 +1152,7 @@ bool FrameWatcher::OnMessageReceived(const IPC::Message& message) {
if (!ViewHostMsg_SwapCompositorFrame::Read(&message, &param))
return false;
std::unique_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
- base::get<1>(param).AssignTo(frame.get());
+ std::get<1>(param).AssignTo(frame.get());
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
@@ -1242,8 +1243,8 @@ bool InputMsgWatcher::OnMessageReceived(const IPC::Message& message) {
if (message.type() == InputHostMsg_HandleInputEvent_ACK::ID) {
InputHostMsg_HandleInputEvent_ACK::Param params;
InputHostMsg_HandleInputEvent_ACK::Read(&message, &params);
- blink::WebInputEvent::Type ack_type = base::get<0>(params).type;
- InputEventAckState ack_state = base::get<0>(params).state;
+ blink::WebInputEvent::Type ack_type = std::get<0>(params).type;
+ InputEventAckState ack_state = std::get<0>(params).state;
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(&InputMsgWatcher::ReceivedAck, this, ack_type, ack_state));

Powered by Google App Engine
This is Rietveld 408576698