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

Side by Side Diff: chrome/browser/webdata/web_data_service_unittest.cc

Issue 10387155: Web Intents: Remove the flag and compile-time define. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | Annotate | Revision Log
OLDNEW
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 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 ASSERT_EQ(2U, consumer.services_.size()); 740 ASSERT_EQ(2U, consumer.services_.size());
741 741
742 if (consumer.services_[0].action != ASCIIToUTF16("edit")) 742 if (consumer.services_[0].action != ASCIIToUTF16("edit"))
743 std::swap(consumer.services_[0],consumer.services_[1]); 743 std::swap(consumer.services_[0],consumer.services_[1]);
744 744
745 EXPECT_EQ(service, consumer.services_[0]); 745 EXPECT_EQ(service, consumer.services_[0]);
746 service.action = ASCIIToUTF16("share"); 746 service.action = ASCIIToUTF16("share");
747 EXPECT_EQ(service, consumer.services_[1]); 747 EXPECT_EQ(service, consumer.services_[1]);
748 } 748 }
749 749
750 #if defined(ENABLE_WEB_INTENTS)
751 TEST_F(WebDataServiceTest, WebIntentsDefaultsTest) { 750 TEST_F(WebDataServiceTest, WebIntentsDefaultsTest) {
752 WebIntentsDefaultsConsumer consumer; 751 WebIntentsDefaultsConsumer consumer;
753 752
754 wds_->GetDefaultWebIntentServicesForAction(ASCIIToUTF16("share"), &consumer); 753 wds_->GetDefaultWebIntentServicesForAction(ASCIIToUTF16("share"), &consumer);
755 WaitUntilCalled(); 754 WaitUntilCalled();
756 EXPECT_EQ(0U, consumer.services_.size()); 755 EXPECT_EQ(0U, consumer.services_.size());
757 756
758 DefaultWebIntentService default_service; 757 DefaultWebIntentService default_service;
759 default_service.action = ASCIIToUTF16("share"); 758 default_service.action = ASCIIToUTF16("share");
760 default_service.type = ASCIIToUTF16("type"); 759 default_service.type = ASCIIToUTF16("type");
(...skipping 25 matching lines...) Expand all
786 wds_->GetDefaultWebIntentServicesForAction(ASCIIToUTF16("share2"), &consumer); 785 wds_->GetDefaultWebIntentServicesForAction(ASCIIToUTF16("share2"), &consumer);
787 WaitUntilCalled(); 786 WaitUntilCalled();
788 ASSERT_EQ(1U, consumer.services_.size()); 787 ASSERT_EQ(1U, consumer.services_.size());
789 EXPECT_EQ("service_url_2", consumer.services_[0].service_url); 788 EXPECT_EQ("service_url_2", consumer.services_[0].service_url);
790 789
791 wds_->GetAllDefaultWebIntentServices(&consumer); 790 wds_->GetAllDefaultWebIntentServices(&consumer);
792 WaitUntilCalled(); 791 WaitUntilCalled();
793 ASSERT_EQ(1U, consumer.services_.size()); 792 ASSERT_EQ(1U, consumer.services_.size());
794 EXPECT_EQ("service_url_2", consumer.services_[0].service_url); 793 EXPECT_EQ("service_url_2", consumer.services_[0].service_url);
795 } 794 }
796 #endif // defined(ENABLE_WEB_INTENTS)
797 795
798 TEST_F(WebDataServiceTest, DidDefaultSearchProviderChangeOnNewProfile) { 796 TEST_F(WebDataServiceTest, DidDefaultSearchProviderChangeOnNewProfile) {
799 KeywordsConsumer consumer; 797 KeywordsConsumer consumer;
800 wds_->GetKeywords(&consumer); 798 wds_->GetKeywords(&consumer);
801 WaitUntilCalled(); 799 WaitUntilCalled();
802 ASSERT_TRUE(consumer.load_succeeded); 800 ASSERT_TRUE(consumer.load_succeeded);
803 EXPECT_FALSE(consumer.keywords_result.did_default_search_provider_change); 801 EXPECT_FALSE(consumer.keywords_result.did_default_search_provider_change);
804 EXPECT_FALSE(consumer.keywords_result.backup_valid); 802 EXPECT_FALSE(consumer.keywords_result.backup_valid);
805 } 803 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/tab_contents/tab_contents_wrapper.cc ('k') | chrome/browser/webdata/web_intents_table_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698