diff options
author | brettw <brettw@chromium.org> | 2015-05-29 15:15:47 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-29 22:16:36 +0000 |
commit | d5ca2bc110d2bcf78dbfafc8b4f8d69663594e77 (patch) | |
tree | 5e571190738d8545b83558db29f4856afbf53556 /content/renderer/input | |
parent | e124019512f944ad49114dea310531418d53ff7e (diff) | |
download | chromium_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/renderer/input')
-rw-r--r-- | content/renderer/input/input_event_filter.cc | 6 | ||||
-rw-r--r-- | content/renderer/input/input_event_filter_unittest.cc | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/content/renderer/input/input_event_filter.cc b/content/renderer/input/input_event_filter.cc index 62d7c45..4d487bd 100644 --- a/content/renderer/input/input_event_filter.cc +++ b/content/renderer/input/input_event_filter.cc @@ -145,9 +145,9 @@ void InputEventFilter::ForwardToHandler(const IPC::Message& message) { InputMsg_HandleInputEvent::Param params; if (!InputMsg_HandleInputEvent::Read(&message, ¶ms)) return; - const WebInputEvent* event = get<0>(params); - ui::LatencyInfo latency_info = get<1>(params); - bool is_keyboard_shortcut = get<2>(params); + const WebInputEvent* event = base::get<0>(params); + ui::LatencyInfo latency_info = base::get<1>(params); + bool is_keyboard_shortcut = base::get<2>(params); DCHECK(event); const bool send_ack = WebInputEventTraits::WillReceiveAckFromRenderer(*event); diff --git a/content/renderer/input/input_event_filter_unittest.cc b/content/renderer/input/input_event_filter_unittest.cc index 6795504..d9a3505 100644 --- a/content/renderer/input/input_event_filter_unittest.cc +++ b/content/renderer/input/input_event_filter_unittest.cc @@ -179,8 +179,8 @@ TEST_F(InputEventFilterTest, Basic) { InputHostMsg_HandleInputEvent_ACK::Param params; EXPECT_TRUE(InputHostMsg_HandleInputEvent_ACK::Read(message, ¶ms)); - WebInputEvent::Type event_type = get<0>(params).type; - InputEventAckState ack_result = get<0>(params).state; + WebInputEvent::Type event_type = base::get<0>(params).type; + InputEventAckState ack_result = base::get<0>(params).state; EXPECT_EQ(kEvents[i].type, event_type); EXPECT_EQ(ack_result, INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS); @@ -205,7 +205,7 @@ TEST_F(InputEventFilterTest, Basic) { ASSERT_EQ(InputMsg_HandleInputEvent::ID, message.type()); InputMsg_HandleInputEvent::Param params; EXPECT_TRUE(InputMsg_HandleInputEvent::Read(&message, ¶ms)); - const WebInputEvent* event = get<0>(params); + const WebInputEvent* event = base::get<0>(params); EXPECT_EQ(kEvents[i].size, event->size); EXPECT_TRUE(memcmp(&kEvents[i], event, event->size) == 0); @@ -231,8 +231,8 @@ TEST_F(InputEventFilterTest, Basic) { InputHostMsg_HandleInputEvent_ACK::Param params; EXPECT_TRUE(InputHostMsg_HandleInputEvent_ACK::Read(message, ¶ms)); - WebInputEvent::Type event_type = get<0>(params).type; - InputEventAckState ack_result = get<0>(params).state; + WebInputEvent::Type event_type = base::get<0>(params).type; + InputEventAckState ack_result = base::get<0>(params).state; EXPECT_EQ(kEvents[i].type, event_type); EXPECT_EQ(ack_result, INPUT_EVENT_ACK_STATE_CONSUMED); } |