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

Side by Side Diff: chrome/browser/intents/web_intents_registry_unittest.cc

Issue 10824212: Add support for unregistering web intents default by service_url. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rename to use "ServiceDefaults" as the method subject. Created 8 years, 4 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
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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/json/json_file_value_serializer.h" 7 #include "base/json/json_file_value_serializer.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/scoped_temp_dir.h" 10 #include "base/scoped_temp_dir.h"
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 s2.action = ASCIIToUTF16("save"); 555 s2.action = ASCIIToUTF16("save");
556 s2.type = ASCIIToUTF16("application/*"); 556 s2.type = ASCIIToUTF16("application/*");
557 // Values here are just dummies to test for preservation. 557 // Values here are just dummies to test for preservation.
558 s2.user_date = 1; 558 s2.user_date = 1;
559 s2.suppression = 4; 559 s2.suppression = 4;
560 s2.service_url = "service_url"; 560 s2.service_url = "service_url";
561 registry_.RegisterDefaultIntentService(s2); 561 registry_.RegisterDefaultIntentService(s2);
562 562
563 DefaultServiceListConsumer consumer; 563 DefaultServiceListConsumer consumer;
564 564
565 // Test we can retrieve default entries by action.
566 registry_.GetAllDefaultIntentServices( 565 registry_.GetAllDefaultIntentServices(
567 base::Bind(&DefaultServiceListConsumer::Accept, 566 base::Bind(&DefaultServiceListConsumer::Accept,
568 base::Unretained(&consumer))); 567 base::Unretained(&consumer)));
569 568
570 consumer.WaitForData(); 569 consumer.WaitForData();
571 570
572 EXPECT_TRUE(consumer.ResultsContain(s0)); 571 EXPECT_TRUE(consumer.ResultsContain(s0));
573 EXPECT_TRUE(consumer.ResultsContain(s1)); 572 EXPECT_TRUE(consumer.ResultsContain(s1));
574 EXPECT_TRUE(consumer.ResultsContain(s2)); 573 EXPECT_TRUE(consumer.ResultsContain(s2));
575 } 574 }
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
727 ServiceListConsumer consumer; 726 ServiceListConsumer consumer;
728 registry_.GetIntentServices(ASCIIToUTF16("http://webintents.org/share"), 727 registry_.GetIntentServices(ASCIIToUTF16("http://webintents.org/share"),
729 ASCIIToUTF16("image/*"), 728 ASCIIToUTF16("image/*"),
730 base::Bind(&ServiceListConsumer::Accept, 729 base::Bind(&ServiceListConsumer::Accept,
731 base::Unretained(&consumer))); 730 base::Unretained(&consumer)));
732 731
733 consumer.WaitForData(); 732 consumer.WaitForData();
734 ASSERT_EQ(1U, consumer.services_.size()); 733 ASSERT_EQ(1U, consumer.services_.size());
735 EXPECT_EQ(ASCIIToUTF16("image/png,image/jpg"), consumer.services_[0].type); 734 EXPECT_EQ(ASCIIToUTF16("image/png,image/jpg"), consumer.services_[0].type);
736 } 735 }
736
737 TEST_F(WebIntentsRegistryTest, UnregisterDefaultIntentServicesForServiceURL) {
738
739 const GURL service_url_0("http://jibfest.com/dozer");
740 const GURL service_url_1("http://kittyfizzer.com/fizz");
741
742 DefaultWebIntentService s0;
743 s0.action = ASCIIToUTF16("share");
744 s0.type = ASCIIToUTF16("text/*");
745 // Values here are just dummies to test for preservation.
746 s0.user_date = 1;
747 s0.suppression = 4;
748 s0.service_url = service_url_0.spec();
749 registry_.RegisterDefaultIntentService(s0);
750
751 DefaultWebIntentService s1;
752 s1.action = ASCIIToUTF16("whack");
753 s1.type = ASCIIToUTF16("text/*");
754 // Values here are just dummies to test for preservation.
755 s1.user_date = 1;
756 s1.suppression = 4;
757 s1.service_url = service_url_1.spec();
758 registry_.RegisterDefaultIntentService(s1);
759
760 DefaultServiceListConsumer consumer;
761
762 registry_.GetAllDefaultIntentServices(
763 base::Bind(&DefaultServiceListConsumer::Accept,
764 base::Unretained(&consumer)));
765
766 consumer.WaitForData();
767
768 ASSERT_EQ(2U, consumer.services_.size());
769
770 registry_.UnregisterServiceDefaults(service_url_0);
771 MessageLoop::current()->RunAllPending();
772
773 registry_.GetAllDefaultIntentServices(
774 base::Bind(&DefaultServiceListConsumer::Accept,
775 base::Unretained(&consumer)));
776
777 consumer.WaitForData();
778
779 ASSERT_EQ(1U, consumer.services_.size());
780 EXPECT_EQ(service_url_1.spec(), consumer.services_[0].service_url);
781 }
OLDNEW
« no previous file with comments | « chrome/browser/intents/web_intents_registry.cc ('k') | chrome/browser/webdata/web_data_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698