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 774 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
785 WaitUntilCalled(); | 785 WaitUntilCalled(); |
786 ASSERT_EQ(1U, consumer.services_.size()); | 786 ASSERT_EQ(1U, consumer.services_.size()); |
787 EXPECT_EQ("service_url_2", consumer.services_[0].service_url); | 787 EXPECT_EQ("service_url_2", consumer.services_[0].service_url); |
788 | 788 |
789 wds_->GetAllDefaultWebIntentServices(&consumer); | 789 wds_->GetAllDefaultWebIntentServices(&consumer); |
790 WaitUntilCalled(); | 790 WaitUntilCalled(); |
791 ASSERT_EQ(1U, consumer.services_.size()); | 791 ASSERT_EQ(1U, consumer.services_.size()); |
792 EXPECT_EQ("service_url_2", consumer.services_[0].service_url); | 792 EXPECT_EQ("service_url_2", consumer.services_[0].service_url); |
793 } | 793 } |
794 | 794 |
| 795 TEST_F(WebDataServiceTest, WebIntentsRemoveDefaultByServiceURL) { |
| 796 WebIntentsDefaultsConsumer consumer; |
| 797 |
| 798 GURL service_url_0("http://pandawaddle.com/observe"); |
| 799 GURL service_url_1("http://kittysnicker.com/mock"); |
| 800 |
| 801 DefaultWebIntentService s0; |
| 802 s0.action = ASCIIToUTF16("share"); |
| 803 s0.type = ASCIIToUTF16("type"); |
| 804 s0.user_date = 1; |
| 805 s0.suppression = 4; |
| 806 s0.service_url = service_url_0.spec(); |
| 807 wds_->AddDefaultWebIntentService(s0); |
| 808 |
| 809 DefaultWebIntentService s1; |
| 810 s1.action = ASCIIToUTF16("share"); |
| 811 s1.type = ASCIIToUTF16("type"); |
| 812 s1.user_date = 1; |
| 813 s1.suppression = 4; |
| 814 s1.service_url = service_url_1.spec(); |
| 815 wds_->AddDefaultWebIntentService(s1); |
| 816 |
| 817 wds_->GetAllDefaultWebIntentServices(&consumer); |
| 818 WaitUntilCalled(); |
| 819 ASSERT_EQ(2U, consumer.services_.size()); |
| 820 |
| 821 wds_->RemoveWebIntentServiceDefaults(service_url_0); |
| 822 MessageLoop::current()->RunAllPending(); |
| 823 |
| 824 wds_->GetAllDefaultWebIntentServices(&consumer); |
| 825 WaitUntilCalled(); |
| 826 ASSERT_EQ(1U, consumer.services_.size()); |
| 827 EXPECT_EQ(service_url_1.spec(), consumer.services_[0].service_url); |
| 828 } |
| 829 |
795 TEST_F(WebDataServiceTest, DidDefaultSearchProviderChangeOnNewProfile) { | 830 TEST_F(WebDataServiceTest, DidDefaultSearchProviderChangeOnNewProfile) { |
796 KeywordsConsumer consumer; | 831 KeywordsConsumer consumer; |
797 wds_->GetKeywords(&consumer); | 832 wds_->GetKeywords(&consumer); |
798 WaitUntilCalled(); | 833 WaitUntilCalled(); |
799 ASSERT_TRUE(consumer.load_succeeded); | 834 ASSERT_TRUE(consumer.load_succeeded); |
800 EXPECT_FALSE(consumer.keywords_result.did_default_search_provider_change); | 835 EXPECT_FALSE(consumer.keywords_result.did_default_search_provider_change); |
801 EXPECT_FALSE(consumer.keywords_result.backup_valid); | 836 EXPECT_FALSE(consumer.keywords_result.backup_valid); |
802 } | 837 } |
OLD | NEW |