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

Unified Diff: chrome/browser/intents/web_intents_registry_unittest.cc

Issue 7601013: Web Intents: Hook up the register intent InfoBar with the WebIntentsRegistry. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Test fix. Created 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/intents/web_intents_registry_unittest.cc
diff --git a/chrome/browser/intents/web_intents_registry_unittest.cc b/chrome/browser/intents/web_intents_registry_unittest.cc
index d8aa4cb1b25abad5fdaf24ea3aa4d74c5e40a58d..b660ea86e166cd304f91d667f3a4e935bbfa683c 100644
--- a/chrome/browser/intents/web_intents_registry_unittest.cc
+++ b/chrome/browser/intents/web_intents_registry_unittest.cc
@@ -21,7 +21,9 @@ class WebIntentsRegistryTest : public testing::Test {
wds_ = new WebDataService();
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
wds_->Init(temp_dir_.path());
- registry_.Initialize(wds_);
+
+ registry_ = new WebIntentsRegistry;
+ registry_->Initialize(wds_);
}
virtual void TearDown() {
@@ -37,7 +39,7 @@ class WebIntentsRegistryTest : public testing::Test {
BrowserThread ui_thread_;
BrowserThread db_thread_;
scoped_refptr<WebDataService> wds_;
- WebIntentsRegistry registry_;
+ scoped_refptr<WebIntentsRegistry> registry_;
ScopedTempDir temp_dir_;
};
@@ -70,32 +72,33 @@ TEST_F(WebIntentsRegistryTest, BasicTests) {
intent.service_url = GURL("http://google.com");
intent.action = ASCIIToUTF16("share");
intent.type = ASCIIToUTF16("image/*");
+ intent.title = ASCIIToUTF16("Google's Sharing Service");
- registry_.RegisterIntentProvider(intent);
+ registry_->RegisterIntentProvider(intent);
intent.type = ASCIIToUTF16("video/*");
- registry_.RegisterIntentProvider(intent);
+ registry_->RegisterIntentProvider(intent);
intent.action = ASCIIToUTF16("search");
- registry_.RegisterIntentProvider(intent);
+ registry_->RegisterIntentProvider(intent);
TestConsumer consumer;
- consumer.expected_id_ = registry_.GetIntentProviders(ASCIIToUTF16("share"),
- &consumer);
+ consumer.expected_id_ = registry_->GetIntentProviders(ASCIIToUTF16("share"),
+ &consumer);
consumer.WaitForData();
EXPECT_EQ(2U, consumer.intents_.size());
- consumer.expected_id_ = registry_.GetIntentProviders(ASCIIToUTF16("search"),
- &consumer);
+ consumer.expected_id_ = registry_->GetIntentProviders(ASCIIToUTF16("search"),
+ &consumer);
consumer.WaitForData();
EXPECT_EQ(1U, consumer.intents_.size());
intent.action = ASCIIToUTF16("share");
intent.type = ASCIIToUTF16("image/*");
- registry_.UnregisterIntentProvider(intent);
+ registry_->UnregisterIntentProvider(intent);
- consumer.expected_id_ = registry_.GetIntentProviders(ASCIIToUTF16("share"),
- &consumer);
+ consumer.expected_id_ = registry_->GetIntentProviders(ASCIIToUTF16("share"),
+ &consumer);
consumer.WaitForData();
EXPECT_EQ(1U, consumer.intents_.size());
}

Powered by Google App Engine
This is Rietveld 408576698