| Index: chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc
|
| diff --git a/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc b/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc
|
| index 34f87fff2fb12fda0c5216847fa1505dc4c71332..426da4622ec8af8e6ecce9d3fd0a33636539f472 100644
|
| --- a/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc
|
| +++ b/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc
|
| @@ -65,29 +65,30 @@ TEST_F(RulesRegistryServiceTest, TestConstructionAndMultiThreading) {
|
| registry_service.RegisterRulesRegistry(make_scoped_refptr(ui_registry));
|
| registry_service.RegisterRulesRegistry(make_scoped_refptr(io_registry));
|
|
|
| - EXPECT_TRUE(registry_service.GetRulesRegistry("ui").get());
|
| - EXPECT_TRUE(registry_service.GetRulesRegistry("io").get());
|
| - EXPECT_FALSE(registry_service.GetRulesRegistry("foo").get());
|
| + const RulesRegistry::WebViewKey key(0, 0);
|
| + EXPECT_TRUE(registry_service.GetRulesRegistry(key, "ui").get());
|
| + EXPECT_TRUE(registry_service.GetRulesRegistry(key, "io").get());
|
| + EXPECT_FALSE(registry_service.GetRulesRegistry(key, "foo").get());
|
|
|
| content::BrowserThread::PostTask(
|
| content::BrowserThread::UI, FROM_HERE,
|
| - base::Bind(&InsertRule, registry_service.GetRulesRegistry("ui"),
|
| + base::Bind(&InsertRule, registry_service.GetRulesRegistry(key, "ui"),
|
| "ui_task"));
|
|
|
| content::BrowserThread::PostTask(
|
| content::BrowserThread::IO, FROM_HERE,
|
| - base::Bind(&InsertRule, registry_service.GetRulesRegistry("io"),
|
| + base::Bind(&InsertRule, registry_service.GetRulesRegistry(key, "io"),
|
| "io_task"));
|
|
|
| content::BrowserThread::PostTask(
|
| content::BrowserThread::UI, FROM_HERE,
|
| base::Bind(&VerifyNumberOfRules,
|
| - registry_service.GetRulesRegistry("ui"), 1));
|
| + registry_service.GetRulesRegistry(key, "ui"), 1));
|
|
|
| content::BrowserThread::PostTask(
|
| content::BrowserThread::IO, FROM_HERE,
|
| base::Bind(&VerifyNumberOfRules,
|
| - registry_service.GetRulesRegistry("io"), 1));
|
| + registry_service.GetRulesRegistry(key, "io"), 1));
|
|
|
| message_loop_.RunUntilIdle();
|
|
|
| @@ -98,12 +99,12 @@ TEST_F(RulesRegistryServiceTest, TestConstructionAndMultiThreading) {
|
| content::BrowserThread::PostTask(
|
| content::BrowserThread::UI, FROM_HERE,
|
| base::Bind(&VerifyNumberOfRules,
|
| - registry_service.GetRulesRegistry("ui"), 0));
|
| + registry_service.GetRulesRegistry(key, "ui"), 0));
|
|
|
| content::BrowserThread::PostTask(
|
| content::BrowserThread::IO, FROM_HERE,
|
| base::Bind(&VerifyNumberOfRules,
|
| - registry_service.GetRulesRegistry("io"), 0));
|
| + registry_service.GetRulesRegistry(key, "io"), 0));
|
|
|
| message_loop_.RunUntilIdle();
|
| }
|
|
|