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

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

Issue 10914278: Fix for non-sticky defaults bug. Added a bunch of tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to head Created 8 years, 3 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 "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 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 GURL("http://www.google.com/"), 589 GURL("http://www.google.com/"),
590 base::Bind(&DefaultServiceConsumer::Accept, 590 base::Bind(&DefaultServiceConsumer::Accept,
591 base::Unretained(&consumer))); 591 base::Unretained(&consumer)));
592 592
593 consumer.WaitForData(); 593 consumer.WaitForData();
594 594
595 EXPECT_EQ("service_url", consumer.service_.service_url); 595 EXPECT_EQ("service_url", consumer.service_.service_url);
596 EXPECT_EQ(1, consumer.service_.user_date); 596 EXPECT_EQ(1, consumer.service_.user_date);
597 EXPECT_EQ(4, consumer.service_.suppression); 597 EXPECT_EQ(4, consumer.service_.suppression);
598 598
599 // Can get for wildcard.
600 consumer.service_ = DefaultWebIntentService();
601 registry_.GetDefaultIntentService(
602 ASCIIToUTF16("share"),
603 ASCIIToUTF16("text/*"),
604 GURL("http://www.google.com/"),
605 base::Bind(&DefaultServiceConsumer::Accept,
606 base::Unretained(&consumer)));
607 consumer.WaitForData();
608 EXPECT_EQ("service_url", consumer.service_.service_url);
609 EXPECT_EQ(1, consumer.service_.user_date);
610 EXPECT_EQ(4, consumer.service_.suppression);
611
599 // Test that no action match means we don't retrieve any 612 // Test that no action match means we don't retrieve any
600 // default entries. 613 // default entries.
601 consumer.service_ = DefaultWebIntentService(); 614 consumer.service_ = DefaultWebIntentService();
602 ASSERT_EQ("", consumer.service_.service_url); 615 ASSERT_EQ("", consumer.service_.service_url);
603 registry_.GetDefaultIntentService( 616 registry_.GetDefaultIntentService(
604 ASCIIToUTF16("no-share"), ASCIIToUTF16("text/plain"), 617 ASCIIToUTF16("no-share"), ASCIIToUTF16("text/plain"),
605 GURL("http://www.google.com/"), 618 GURL("http://www.google.com/"),
606 base::Bind(&DefaultServiceConsumer::Accept, 619 base::Bind(&DefaultServiceConsumer::Accept,
607 base::Unretained(&consumer))); 620 base::Unretained(&consumer)));
608 621
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 783
771 registry_.GetAllDefaultIntentServices( 784 registry_.GetAllDefaultIntentServices(
772 base::Bind(&DefaultServiceListConsumer::Accept, 785 base::Bind(&DefaultServiceListConsumer::Accept,
773 base::Unretained(&consumer))); 786 base::Unretained(&consumer)));
774 787
775 consumer.WaitForData(); 788 consumer.WaitForData();
776 789
777 ASSERT_EQ(1U, consumer.services_.size()); 790 ASSERT_EQ(1U, consumer.services_.size());
778 EXPECT_EQ(service_url_1.spec(), consumer.services_[0].service_url); 791 EXPECT_EQ(service_url_1.spec(), consumer.services_[0].service_url);
779 } 792 }
OLDNEW
« no previous file with comments | « chrome/browser/intents/web_intents_registry.cc ('k') | chrome/browser/webdata/web_data_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698