| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 734 ASSERT_EQ(2U, consumer.services_.size()); | 734 ASSERT_EQ(2U, consumer.services_.size()); |
| 735 | 735 |
| 736 if (consumer.services_[0].action != ASCIIToUTF16("edit")) | 736 if (consumer.services_[0].action != ASCIIToUTF16("edit")) |
| 737 std::swap(consumer.services_[0],consumer.services_[1]); | 737 std::swap(consumer.services_[0],consumer.services_[1]); |
| 738 | 738 |
| 739 EXPECT_EQ(service, consumer.services_[0]); | 739 EXPECT_EQ(service, consumer.services_[0]); |
| 740 service.action = ASCIIToUTF16("share"); | 740 service.action = ASCIIToUTF16("share"); |
| 741 EXPECT_EQ(service, consumer.services_[1]); | 741 EXPECT_EQ(service, consumer.services_[1]); |
| 742 } | 742 } |
| 743 | 743 |
| 744 #if defined(ENABLE_WEB_INTENTS) |
| 744 TEST_F(WebDataServiceTest, WebIntentsDefaultsTest) { | 745 TEST_F(WebDataServiceTest, WebIntentsDefaultsTest) { |
| 745 WebIntentsDefaultsConsumer consumer; | 746 WebIntentsDefaultsConsumer consumer; |
| 746 | 747 |
| 747 wds_->GetDefaultWebIntentServicesForAction(ASCIIToUTF16("share"), &consumer); | 748 wds_->GetDefaultWebIntentServicesForAction(ASCIIToUTF16("share"), &consumer); |
| 748 WaitUntilCalled(); | 749 WaitUntilCalled(); |
| 749 EXPECT_EQ(0U, consumer.services_.size()); | 750 EXPECT_EQ(0U, consumer.services_.size()); |
| 750 | 751 |
| 751 DefaultWebIntentService default_service; | 752 DefaultWebIntentService default_service; |
| 752 default_service.action = ASCIIToUTF16("share"); | 753 default_service.action = ASCIIToUTF16("share"); |
| 753 default_service.type = ASCIIToUTF16("type"); | 754 default_service.type = ASCIIToUTF16("type"); |
| (...skipping 25 matching lines...) Expand all Loading... |
| 779 wds_->GetDefaultWebIntentServicesForAction(ASCIIToUTF16("share2"), &consumer); | 780 wds_->GetDefaultWebIntentServicesForAction(ASCIIToUTF16("share2"), &consumer); |
| 780 WaitUntilCalled(); | 781 WaitUntilCalled(); |
| 781 ASSERT_EQ(1U, consumer.services_.size()); | 782 ASSERT_EQ(1U, consumer.services_.size()); |
| 782 EXPECT_EQ("service_url_2", consumer.services_[0].service_url); | 783 EXPECT_EQ("service_url_2", consumer.services_[0].service_url); |
| 783 | 784 |
| 784 wds_->GetAllDefaultWebIntentServices(&consumer); | 785 wds_->GetAllDefaultWebIntentServices(&consumer); |
| 785 WaitUntilCalled(); | 786 WaitUntilCalled(); |
| 786 ASSERT_EQ(1U, consumer.services_.size()); | 787 ASSERT_EQ(1U, consumer.services_.size()); |
| 787 EXPECT_EQ("service_url_2", consumer.services_[0].service_url); | 788 EXPECT_EQ("service_url_2", consumer.services_[0].service_url); |
| 788 } | 789 } |
| 790 #endif // defined(ENABLE_WEB_INTENTS) |
| 789 | 791 |
| 790 TEST_F(WebDataServiceTest, DidDefaultSearchProviderChangeOnNewProfile) { | 792 TEST_F(WebDataServiceTest, DidDefaultSearchProviderChangeOnNewProfile) { |
| 791 KeywordsConsumer consumer; | 793 KeywordsConsumer consumer; |
| 792 wds_->GetKeywords(&consumer); | 794 wds_->GetKeywords(&consumer); |
| 793 WaitUntilCalled(); | 795 WaitUntilCalled(); |
| 794 ASSERT_TRUE(consumer.load_succeeded); | 796 ASSERT_TRUE(consumer.load_succeeded); |
| 795 EXPECT_FALSE(consumer.keywords_result.did_default_search_provider_change); | 797 EXPECT_FALSE(consumer.keywords_result.did_default_search_provider_change); |
| 796 EXPECT_EQ(NULL, consumer.keywords_result.default_search_provider_backup); | 798 EXPECT_EQ(NULL, consumer.keywords_result.default_search_provider_backup); |
| 797 } | 799 } |
| OLD | NEW |