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

Side by Side Diff: chrome/renderer/autofill/form_autocomplete_browsertest.cc

Issue 1767343004: Replace base::Tuple in //chrome with std::tuple (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: s/typedef/using/ Created 4 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <tuple>
6
5 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
6 #include "base/time/time.h" 8 #include "base/time/time.h"
7 #include "build/build_config.h" 9 #include "build/build_config.h"
8 #include "chrome/test/base/chrome_render_view_test.h" 10 #include "chrome/test/base/chrome_render_view_test.h"
9 #include "components/autofill/content/common/autofill_messages.h" 11 #include "components/autofill/content/common/autofill_messages.h"
10 #include "components/autofill/content/renderer/autofill_agent.h" 12 #include "components/autofill/content/renderer/autofill_agent.h"
11 #include "components/autofill/core/common/form_data.h" 13 #include "components/autofill/core/common/form_data.h"
12 #include "content/public/test/mock_render_thread.h" 14 #include "content/public/test/mock_render_thread.h"
13 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
14 #include "third_party/WebKit/public/web/WebDocument.h" 16 #include "third_party/WebKit/public/web/WebDocument.h"
(...skipping 23 matching lines...) Expand all
38 const IPC::Message* will_submit_message = 40 const IPC::Message* will_submit_message =
39 render_thread->sink().GetFirstMessageMatching( 41 render_thread->sink().GetFirstMessageMatching(
40 AutofillHostMsg_WillSubmitForm::ID); 42 AutofillHostMsg_WillSubmitForm::ID);
41 const IPC::Message* submitted_message = 43 const IPC::Message* submitted_message =
42 render_thread->sink().GetFirstMessageMatching( 44 render_thread->sink().GetFirstMessageMatching(
43 AutofillHostMsg_FormSubmitted::ID); 45 AutofillHostMsg_FormSubmitted::ID);
44 ASSERT_TRUE(will_submit_message != NULL); 46 ASSERT_TRUE(will_submit_message != NULL);
45 ASSERT_EQ(expect_submitted_message, submitted_message != NULL); 47 ASSERT_EQ(expect_submitted_message, submitted_message != NULL);
46 48
47 // The tuple also includes a timestamp, which is ignored. 49 // The tuple also includes a timestamp, which is ignored.
48 base::Tuple<FormData, base::TimeTicks> will_submit_forms; 50 std::tuple<FormData, base::TimeTicks> will_submit_forms;
49 AutofillHostMsg_WillSubmitForm::Read(will_submit_message, &will_submit_forms); 51 AutofillHostMsg_WillSubmitForm::Read(will_submit_message, &will_submit_forms);
50 ASSERT_EQ(2U, base::get<0>(will_submit_forms).fields.size()); 52 ASSERT_EQ(2U, std::get<0>(will_submit_forms).fields.size());
51 53
52 FormFieldData& will_submit_form_field = 54 FormFieldData& will_submit_form_field =
53 base::get<0>(will_submit_forms).fields[0]; 55 std::get<0>(will_submit_forms).fields[0];
54 EXPECT_EQ(WebString("fname"), will_submit_form_field.name); 56 EXPECT_EQ(WebString("fname"), will_submit_form_field.name);
55 EXPECT_EQ(WebString(base::UTF8ToUTF16(fname)), will_submit_form_field.value); 57 EXPECT_EQ(WebString(base::UTF8ToUTF16(fname)), will_submit_form_field.value);
56 will_submit_form_field = base::get<0>(will_submit_forms).fields[1]; 58 will_submit_form_field = std::get<0>(will_submit_forms).fields[1];
57 EXPECT_EQ(WebString("lname"), will_submit_form_field.name); 59 EXPECT_EQ(WebString("lname"), will_submit_form_field.name);
58 EXPECT_EQ(WebString(base::UTF8ToUTF16(lname)), will_submit_form_field.value); 60 EXPECT_EQ(WebString(base::UTF8ToUTF16(lname)), will_submit_form_field.value);
59 61
60 if (expect_submitted_message) { 62 if (expect_submitted_message) {
61 base::Tuple<FormData> submitted_forms; 63 std::tuple<FormData> submitted_forms;
62 AutofillHostMsg_FormSubmitted::Read(submitted_message, &submitted_forms); 64 AutofillHostMsg_FormSubmitted::Read(submitted_message, &submitted_forms);
63 ASSERT_EQ(2U, base::get<0>(submitted_forms).fields.size()); 65 ASSERT_EQ(2U, std::get<0>(submitted_forms).fields.size());
64 66
65 FormFieldData& submitted_field = base::get<0>(submitted_forms).fields[0]; 67 FormFieldData& submitted_field = std::get<0>(submitted_forms).fields[0];
66 EXPECT_EQ(WebString("fname"), submitted_field.name); 68 EXPECT_EQ(WebString("fname"), submitted_field.name);
67 EXPECT_EQ(WebString(base::UTF8ToUTF16(fname)), submitted_field.value); 69 EXPECT_EQ(WebString(base::UTF8ToUTF16(fname)), submitted_field.value);
68 submitted_field = base::get<0>(submitted_forms).fields[1]; 70 submitted_field = std::get<0>(submitted_forms).fields[1];
69 EXPECT_EQ(WebString("lname"), submitted_field.name); 71 EXPECT_EQ(WebString("lname"), submitted_field.name);
70 EXPECT_EQ(WebString(base::UTF8ToUTF16(lname)), submitted_field.value); 72 EXPECT_EQ(WebString(base::UTF8ToUTF16(lname)), submitted_field.value);
71 } 73 }
72 } 74 }
73 75
74 // Helper function to verify that NO form-related messages are received from the 76 // Helper function to verify that NO form-related messages are received from the
75 // renderer. 77 // renderer.
76 void VerifyNoSubmitMessagesReceived(content::MockRenderThread* render_thread) { 78 void VerifyNoSubmitMessagesReceived(content::MockRenderThread* render_thread) {
77 // No submission messages sent. 79 // No submission messages sent.
78 const IPC::Message* will_submit_message = 80 const IPC::Message* will_submit_message =
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 507
506 // Submit the form. 508 // Submit the form.
507 ExecuteJavaScriptForTests("document.getElementById('myForm').submit();"); 509 ExecuteJavaScriptForTests("document.getElementById('myForm').submit();");
508 ProcessPendingMessages(); 510 ProcessPendingMessages();
509 511
510 VerifyReceivedRendererMessages(render_thread_.get(), "Rick", "Deckard", 512 VerifyReceivedRendererMessages(render_thread_.get(), "Rick", "Deckard",
511 true /* expect_submitted_message */); 513 true /* expect_submitted_message */);
512 } 514 }
513 515
514 } // namespace autofill 516 } // namespace autofill
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698