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

Side by Side Diff: chrome/renderer/autofill/form_autocomplete_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, 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 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 "base/time/time.h" 5 #include "base/time/time.h"
6 #include "chrome/test/base/chrome_render_view_test.h" 6 #include "chrome/test/base/chrome_render_view_test.h"
7 #include "components/autofill/content/common/autofill_messages.h" 7 #include "components/autofill/content/common/autofill_messages.h"
8 #include "components/autofill/core/common/form_data.h" 8 #include "components/autofill/core/common/form_data.h"
9 #include "content/public/test/mock_render_thread.h" 9 #include "content/public/test/mock_render_thread.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 20 matching lines...) Expand all
31 const IPC::Message* will_submit_message = 31 const IPC::Message* will_submit_message =
32 render_thread->sink().GetFirstMessageMatching( 32 render_thread->sink().GetFirstMessageMatching(
33 AutofillHostMsg_WillSubmitForm::ID); 33 AutofillHostMsg_WillSubmitForm::ID);
34 const IPC::Message* submitted_message = 34 const IPC::Message* submitted_message =
35 render_thread->sink().GetFirstMessageMatching( 35 render_thread->sink().GetFirstMessageMatching(
36 AutofillHostMsg_FormSubmitted::ID); 36 AutofillHostMsg_FormSubmitted::ID);
37 ASSERT_TRUE(will_submit_message != NULL); 37 ASSERT_TRUE(will_submit_message != NULL);
38 ASSERT_EQ(expect_submitted_message, submitted_message != NULL); 38 ASSERT_EQ(expect_submitted_message, submitted_message != NULL);
39 39
40 // The tuple also includes a timestamp, which is ignored. 40 // The tuple also includes a timestamp, which is ignored.
41 Tuple<FormData, base::TimeTicks> will_submit_forms; 41 base::Tuple<FormData, base::TimeTicks> will_submit_forms;
42 AutofillHostMsg_WillSubmitForm::Read(will_submit_message, &will_submit_forms); 42 AutofillHostMsg_WillSubmitForm::Read(will_submit_message, &will_submit_forms);
43 ASSERT_EQ(2U, get<0>(will_submit_forms).fields.size()); 43 ASSERT_EQ(2U, base::get<0>(will_submit_forms).fields.size());
44 44
45 FormFieldData& will_submit_form_field = get<0>(will_submit_forms).fields[0]; 45 FormFieldData& will_submit_form_field =
46 base::get<0>(will_submit_forms).fields[0];
46 EXPECT_EQ(WebString("fname"), will_submit_form_field.name); 47 EXPECT_EQ(WebString("fname"), will_submit_form_field.name);
47 EXPECT_EQ(WebString("Rick"), will_submit_form_field.value); 48 EXPECT_EQ(WebString("Rick"), will_submit_form_field.value);
48 will_submit_form_field = get<0>(will_submit_forms).fields[1]; 49 will_submit_form_field = base::get<0>(will_submit_forms).fields[1];
49 EXPECT_EQ(WebString("lname"), will_submit_form_field.name); 50 EXPECT_EQ(WebString("lname"), will_submit_form_field.name);
50 EXPECT_EQ(WebString("Deckard"), will_submit_form_field.value); 51 EXPECT_EQ(WebString("Deckard"), will_submit_form_field.value);
51 52
52 if (expect_submitted_message) { 53 if (expect_submitted_message) {
53 Tuple<FormData> submitted_forms; 54 base::Tuple<FormData> submitted_forms;
54 AutofillHostMsg_FormSubmitted::Read(submitted_message, &submitted_forms); 55 AutofillHostMsg_FormSubmitted::Read(submitted_message, &submitted_forms);
55 ASSERT_EQ(2U, get<0>(submitted_forms).fields.size()); 56 ASSERT_EQ(2U, base::get<0>(submitted_forms).fields.size());
56 57
57 FormFieldData& submitted_field = get<0>(submitted_forms).fields[0]; 58 FormFieldData& submitted_field = base::get<0>(submitted_forms).fields[0];
58 EXPECT_EQ(WebString("fname"), submitted_field.name); 59 EXPECT_EQ(WebString("fname"), submitted_field.name);
59 EXPECT_EQ(WebString("Rick"), submitted_field.value); 60 EXPECT_EQ(WebString("Rick"), submitted_field.value);
60 submitted_field = get<0>(submitted_forms).fields[1]; 61 submitted_field = base::get<0>(submitted_forms).fields[1];
61 EXPECT_EQ(WebString("lname"), submitted_field.name); 62 EXPECT_EQ(WebString("lname"), submitted_field.name);
62 EXPECT_EQ(WebString("Deckard"), submitted_field.value); 63 EXPECT_EQ(WebString("Deckard"), submitted_field.value);
63 } 64 }
64 } 65 }
65 66
66 } // end namespace 67 } // end namespace
67 68
68 // Tests that submitting a form generates WillSubmitForm and FormSubmitted 69 // Tests that submitting a form generates WillSubmitForm and FormSubmitted
69 // messages with the form fields. 70 // messages with the form fields.
70 TEST_F(FormAutocompleteTest, NormalFormSubmit) { 71 TEST_F(FormAutocompleteTest, NormalFormSubmit) {
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 155
155 // Submit the form. 156 // Submit the form.
156 ExecuteJavaScript("document.getElementById('myForm').submit();"); 157 ExecuteJavaScript("document.getElementById('myForm').submit();");
157 ProcessPendingMessages(); 158 ProcessPendingMessages();
158 159
159 VerifyReceivedRendererMessages(render_thread_.get(), 160 VerifyReceivedRendererMessages(render_thread_.get(),
160 true /* expect_submitted_message */); 161 true /* expect_submitted_message */);
161 } 162 }
162 163
163 } // namespace autofill 164 } // namespace autofill
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698