<webview>: Implement declarativeWebRequest API

chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/extensions/api/declarative/test_rules_registry.h"
 #include "content/public/test/test_browser_thread.h"
@@ skipping 47 matching lines @@
 
   TestRulesRegistry* io_registry =
       new TestRulesRegistry(content::BrowserThread::IO, "io");
 
   // Test registration.
 
   RulesRegistryService registry_service(NULL);
   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);

[vabr (Chromium), 2013/10/25 20:40:24]

I think we also need to test adding and removing registries for <webviews>. In
particular, we should test that if the webview renderer process terminates, the
corresponding registries are removed.

[Fady Samuel, 2013/10/25 22:48:08]

Agreed, but I'm not sure how to do that in a unit test. I'll chat with you about
this early morning (afternoon for you) on Monday. Thanks.

+  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();
 
   // Test extension unloading.
 
   registry_service.SimulateExtensionUnloaded(kExtensionId);
 
   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();
 }
 

[vabr (Chromium), 2013/10/25 20:40:24]

Could you also please test that GetContentRulesRegistry works? Since it's no
more a simple getter, but involves creation on demand, we should make sure that
that creation on demand works.

 }  // namespace extensions