content/browser/renderer_host/render_widget_host_view_mac_unittest.mm - Issue 1159553007: Move Tuple to base namespace.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

Issue 1159553007: Move Tuple to base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 7 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

« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura_unittest.cc ('k') | content/browser/resolve_proxy_msg_helper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

diff --git a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

index f522680d582fb26b010df8de85206115d38051e2..772b6c0505e32b2488ea2d4c1b6959e4dd8edce8 100644

--- a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

+++ b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

@@ -847,9 +847,9 @@ TEST_F(RenderWidgetHostViewMacTest, Background) {

set_background = process_host->sink().GetUniqueMessageMatching(

ViewMsg_SetBackgroundOpaque::ID);

ASSERT_TRUE(set_background);

- Tuple<bool> sent_background;

+ base::Tuple<bool> sent_background;

ViewMsg_SetBackgroundOpaque::Read(set_background, &sent_background);

- EXPECT_FALSE(get<0>(sent_background));

+ EXPECT_FALSE(base::get<0>(sent_background));

// Try setting it back.

process_host->sink().ClearMessages();

@@ -860,7 +860,7 @@ TEST_F(RenderWidgetHostViewMacTest, Background) {

ViewMsg_SetBackgroundOpaque::ID);

ASSERT_TRUE(set_background);

ViewMsg_SetBackgroundOpaque::Read(set_background, &sent_background);

- EXPECT_TRUE(get<0>(sent_background));

+ EXPECT_TRUE(base::get<0>(sent_background));

host->Shutdown();

}

@@ -885,9 +885,9 @@ class RenderWidgetHostViewMacPinchTest : public RenderWidgetHostViewMacTest {

break;

}

DCHECK(message);

- Tuple<IPC::WebInputEventPointer, ui::LatencyInfo, bool> data;

+ base::Tuple<IPC::WebInputEventPointer, ui::LatencyInfo, bool> data;

InputMsg_HandleInputEvent::Read(message, &data);

- IPC::WebInputEventPointer ipc_event = get<0>(data);

+ IPC::WebInputEventPointer ipc_event = base::get<0>(data);

const blink::WebGestureEvent* gesture_event =

static_cast<const blink::WebGestureEvent*>(ipc_event);

return gesture_event->data.pinchUpdate.zoomDisabled;