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