| OLD | NEW |
| 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 <string> | 5 #include <string> |
| 6 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 | 122 |
| 123 virtual void TearDown() { | 123 virtual void TearDown() { |
| 124 // Release this first so it can get destructed on the db thread. | 124 // Release this first so it can get destructed on the db thread. |
| 125 observer_helper_ = NULL; | 125 observer_helper_ = NULL; |
| 126 WebDataServiceTest::TearDown(); | 126 WebDataServiceTest::TearDown(); |
| 127 } | 127 } |
| 128 | 128 |
| 129 void AppendFormField(const string16& name, | 129 void AppendFormField(const string16& name, |
| 130 const string16& value, | 130 const string16& value, |
| 131 std::vector<webkit_glue::FormField>* form_fields) { | 131 std::vector<webkit_glue::FormField>* form_fields) { |
| 132 form_fields->push_back( | 132 webkit_glue::FormField field; |
| 133 webkit_glue::FormField(string16(), | 133 field.name = name; |
| 134 name, | 134 field.value = value; |
| 135 value, | 135 form_fields->push_back(field); |
| 136 string16(), | |
| 137 0, | |
| 138 false)); | |
| 139 } | 136 } |
| 140 | 137 |
| 141 string16 name1_; | 138 string16 name1_; |
| 142 string16 name2_; | 139 string16 name2_; |
| 143 string16 value1_; | 140 string16 value1_; |
| 144 string16 value2_; | 141 string16 value2_; |
| 145 int unique_id1_, unique_id2_; | 142 int unique_id1_, unique_id2_; |
| 146 const TimeDelta test_timeout_; | 143 const TimeDelta test_timeout_; |
| 147 scoped_refptr<AutofillDBThreadObserverHelper> observer_helper_; | 144 scoped_refptr<AutofillDBThreadObserverHelper> observer_helper_; |
| 148 WaitableEvent done_event_; | 145 WaitableEvent done_event_; |
| (...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 634 wds_->GetWebIntents(ASCIIToUTF16("share"), &consumer); | 631 wds_->GetWebIntents(ASCIIToUTF16("share"), &consumer); |
| 635 WebIntentsConsumer::WaitUntilCalled(); | 632 WebIntentsConsumer::WaitUntilCalled(); |
| 636 ASSERT_EQ(1U, consumer.intents.size()); | 633 ASSERT_EQ(1U, consumer.intents.size()); |
| 637 | 634 |
| 638 intent.type = ASCIIToUTF16("video/*"); | 635 intent.type = ASCIIToUTF16("video/*"); |
| 639 EXPECT_EQ(intent.service_url, consumer.intents[0].service_url); | 636 EXPECT_EQ(intent.service_url, consumer.intents[0].service_url); |
| 640 EXPECT_EQ(intent.action, consumer.intents[0].action); | 637 EXPECT_EQ(intent.action, consumer.intents[0].action); |
| 641 EXPECT_EQ(intent.type, consumer.intents[0].type); | 638 EXPECT_EQ(intent.type, consumer.intents[0].type); |
| 642 } | 639 } |
| 643 | 640 |
| OLD | NEW |