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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/render_view_browsertest.cc

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/renderer/render_frame_proxy.cc ('k') | content/renderer/render_widget_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_browsertest.cc
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 8cb8e2ab7690d6ea63b3e6542bf18d96cd42c09e..b7898f597251f84a01e8aee3bdd9cef0b400d259 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -406,8 +406,8 @@ TEST_F(RenderViewImplTest, SaveImageFromDataURL) {
ViewHostMsg_SaveImageFromDataURL::Param param1;
ViewHostMsg_SaveImageFromDataURL::Read(msg2, &param1);
- EXPECT_EQ(get<1>(param1).length(), image_data_url.length());
- EXPECT_EQ(get<1>(param1), image_data_url);
+ EXPECT_EQ(base::get<1>(param1).length(), image_data_url.length());
+ EXPECT_EQ(base::get<1>(param1), image_data_url);
ProcessPendingMessages();
render_thread_->sink().ClearMessages();
@@ -422,8 +422,8 @@ TEST_F(RenderViewImplTest, SaveImageFromDataURL) {
ViewHostMsg_SaveImageFromDataURL::Param param2;
ViewHostMsg_SaveImageFromDataURL::Read(msg3, &param2);
- EXPECT_EQ(get<1>(param2).length(), large_data_url.length());
- EXPECT_EQ(get<1>(param2), large_data_url);
+ EXPECT_EQ(base::get<1>(param2).length(), large_data_url.length());
+ EXPECT_EQ(base::get<1>(param2), large_data_url);
ProcessPendingMessages();
render_thread_->sink().ClearMessages();
@@ -488,12 +488,12 @@ TEST_F(RenderViewImplTest, OnNavigationHttpPost) {
FrameHostMsg_DidCommitProvisionalLoad::Param host_nav_params;
FrameHostMsg_DidCommitProvisionalLoad::Read(frame_navigate_msg,
&host_nav_params);
- EXPECT_TRUE(get<0>(host_nav_params).is_post);
+ EXPECT_TRUE(base::get<0>(host_nav_params).is_post);
// Check post data sent to browser matches
- EXPECT_TRUE(get<0>(host_nav_params).page_state.IsValid());
+ EXPECT_TRUE(base::get<0>(host_nav_params).page_state.IsValid());
scoped_ptr<HistoryEntry> entry =
- PageStateToHistoryEntry(get<0>(host_nav_params).page_state);
+ PageStateToHistoryEntry(base::get<0>(host_nav_params).page_state);
blink::WebHTTPBody body = entry->root().httpBody();
blink::WebHTTPBody::Element element;
bool successful = body.elementAt(0, element);
@@ -699,8 +699,8 @@ TEST_F(RenderViewImplTest, ReloadWhileSwappedOut) {
ASSERT_TRUE(msg_A);
ViewHostMsg_UpdateState::Param params;
ViewHostMsg_UpdateState::Read(msg_A, &params);
- int page_id_A = get<0>(params);
- PageState state_A = get<1>(params);
+ int page_id_A = base::get<0>(params);
+ PageState state_A = base::get<1>(params);
EXPECT_EQ(1, page_id_A);
render_thread_->sink().ClearMessages();
@@ -758,7 +758,7 @@ TEST_F(RenderViewImplTest, ReloadWhileSwappedOut) {
FrameHostMsg_DidCommitProvisionalLoad::Param commit_load_params;
FrameHostMsg_DidCommitProvisionalLoad::Read(frame_navigate_msg,
&commit_load_params);
- EXPECT_NE(GURL("swappedout://"), get<0>(commit_load_params).url);
+ EXPECT_NE(GURL("swappedout://"), base::get<0>(commit_load_params).url);
}
// Verify that security origins are replicated properly to RenderFrameProxies
@@ -818,8 +818,8 @@ TEST_F(RenderViewImplTest, DISABLED_LastCommittedUpdateState) {
ASSERT_TRUE(msg_A);
ViewHostMsg_UpdateState::Param param;
ViewHostMsg_UpdateState::Read(msg_A, &param);
- int page_id_A = get<0>(param);
- PageState state_A = get<1>(param);
+ int page_id_A = base::get<0>(param);
+ PageState state_A = base::get<1>(param);
EXPECT_EQ(1, page_id_A);
render_thread_->sink().ClearMessages();
@@ -832,8 +832,8 @@ TEST_F(RenderViewImplTest, DISABLED_LastCommittedUpdateState) {
ViewHostMsg_UpdateState::ID);
ASSERT_TRUE(msg_B);
ViewHostMsg_UpdateState::Read(msg_B, &param);
- int page_id_B = get<0>(param);
- PageState state_B = get<1>(param);
+ int page_id_B = base::get<0>(param);
+ PageState state_B = base::get<1>(param);
EXPECT_EQ(2, page_id_B);
EXPECT_NE(state_A, state_B);
render_thread_->sink().ClearMessages();
@@ -847,8 +847,8 @@ TEST_F(RenderViewImplTest, DISABLED_LastCommittedUpdateState) {
ViewHostMsg_UpdateState::ID);
ASSERT_TRUE(msg_C);
ViewHostMsg_UpdateState::Read(msg_C, &param);
- int page_id_C = get<0>(param);
- PageState state_C = get<1>(param);
+ int page_id_C = base::get<0>(param);
+ PageState state_C = base::get<1>(param);
EXPECT_EQ(3, page_id_C);
EXPECT_NE(state_B, state_C);
render_thread_->sink().ClearMessages();
@@ -902,8 +902,8 @@ TEST_F(RenderViewImplTest, DISABLED_LastCommittedUpdateState) {
ViewHostMsg_UpdateState::ID);
ASSERT_TRUE(msg);
ViewHostMsg_UpdateState::Read(msg, &param);
- int page_id = get<0>(param);
- PageState state = get<1>(param);
+ int page_id = base::get<0>(param);
+ PageState state = base::get<1>(param);
EXPECT_EQ(page_id_C, page_id);
EXPECT_NE(state_A, state);
EXPECT_NE(state_B, state);
@@ -930,8 +930,8 @@ TEST_F(RenderViewImplTest, StaleNavigationsIgnored) {
ASSERT_TRUE(msg_A);
ViewHostMsg_UpdateState::Param param;
ViewHostMsg_UpdateState::Read(msg_A, &param);
- int page_id_A = get<0>(param);
- PageState state_A = get<1>(param);
+ int page_id_A = base::get<0>(param);
+ PageState state_A = base::get<1>(param);
EXPECT_EQ(1, page_id_A);
render_thread_->sink().ClearMessages();
@@ -1060,9 +1060,9 @@ TEST_F(RenderViewImplTest, OnImeTypeChanged) {
EXPECT_EQ(ViewHostMsg_TextInputTypeChanged::ID, msg->type());
ViewHostMsg_TextInputTypeChanged::Param params;
ViewHostMsg_TextInputTypeChanged::Read(msg, &params);
- ui::TextInputType type = get<0>(params);
- ui::TextInputMode input_mode = get<1>(params);
- bool can_compose_inline = get<2>(params);
+ ui::TextInputType type = base::get<0>(params);
+ ui::TextInputMode input_mode = base::get<1>(params);
+ bool can_compose_inline = base::get<2>(params);
EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT, type);
EXPECT_EQ(true, can_compose_inline);
@@ -1079,8 +1079,8 @@ TEST_F(RenderViewImplTest, OnImeTypeChanged) {
EXPECT_TRUE(msg != NULL);
EXPECT_EQ(ViewHostMsg_TextInputTypeChanged::ID, msg->type());
ViewHostMsg_TextInputTypeChanged::Read(msg, & params);
- type = get<0>(params);
- input_mode = get<1>(params);
+ type = base::get<0>(params);
+ input_mode = base::get<1>(params);
EXPECT_EQ(ui::TEXT_INPUT_TYPE_PASSWORD, type);
for (size_t i = 0; i < arraysize(kInputModeTestCases); i++) {
@@ -1101,8 +1101,8 @@ TEST_F(RenderViewImplTest, OnImeTypeChanged) {
EXPECT_TRUE(msg != NULL);
EXPECT_EQ(ViewHostMsg_TextInputTypeChanged::ID, msg->type());
ViewHostMsg_TextInputTypeChanged::Read(msg, & params);
- type = get<0>(params);
- input_mode = get<1>(params);
+ type = base::get<0>(params);
+ input_mode = base::get<1>(params);
EXPECT_EQ(test_case->expected_mode, input_mode);
}
}
@@ -2227,7 +2227,7 @@ TEST_F(RenderViewImplTest, FocusElementCallsFocusedNodeChanged) {
ViewHostMsg_FocusedNodeChanged::Param params;
ViewHostMsg_FocusedNodeChanged::Read(msg1, &params);
- EXPECT_TRUE(get<0>(params));
+ EXPECT_TRUE(base::get<0>(params));
render_thread_->sink().ClearMessages();
ExecuteJavaScript("document.getElementById('test2').focus();");
@@ -2235,7 +2235,7 @@ TEST_F(RenderViewImplTest, FocusElementCallsFocusedNodeChanged) {
ViewHostMsg_FocusedNodeChanged::ID);
EXPECT_TRUE(msg2);
ViewHostMsg_FocusedNodeChanged::Read(msg2, &params);
- EXPECT_TRUE(get<0>(params));
+ EXPECT_TRUE(base::get<0>(params));
render_thread_->sink().ClearMessages();
view()->webview()->clearFocusedElement();
@@ -2243,7 +2243,7 @@ TEST_F(RenderViewImplTest, FocusElementCallsFocusedNodeChanged) {
ViewHostMsg_FocusedNodeChanged::ID);
EXPECT_TRUE(msg3);
ViewHostMsg_FocusedNodeChanged::Read(msg3, &params);
- EXPECT_FALSE(get<0>(params));
+ EXPECT_FALSE(base::get<0>(params));
render_thread_->sink().ClearMessages();
}
« no previous file with comments | « content/renderer/render_frame_proxy.cc ('k') | content/renderer/render_widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698