Remove WebViewKey in rules registry.

extensions/browser/api/declarative/declarative_api.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 "extensions/browser/api/declarative/declarative_api.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/task_runner_util.h"
@@ skipping 121 matching lines @@
           extension_.get(),
           Feature::BLESSED_EXTENSION_CONTEXT,
           source_url());
   return availability.is_available();
 }
 
 bool RulesFunction::RunAsync() {
   std::string event_name;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &event_name));
 
-  int webview_instance_id = 0;
-  EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(1, &webview_instance_id));
+  int web_view_instance_id = 0;
+  EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(1, &web_view_instance_id));
   int embedder_process_id = render_view_host()->GetProcess()->GetID();
 
-  bool has_webview = webview_instance_id != 0;
+  bool has_webview = web_view_instance_id != 0;

[Ken Rockot(use gerrit already), 2014/12/01 22:02:38]

nit: If this is changing from webview_instance_id to web_view_instance_id,
perhaps has_webview should also change to has_web_view.

   if (has_webview != IsWebViewEvent(event_name))
     EXTENSION_FUNCTION_ERROR(kWebViewExpectedError);
   event_name = GetWebRequestEventName(event_name);
 
-  // If we are not operating on a particular <webview>, then the key is (0, 0).
-  RulesRegistry::WebViewKey key(
-      webview_instance_id ? embedder_process_id : 0, webview_instance_id);
+  // If we are not operating on a particular <webview>, then the key is 0.
+  int rules_registry_id = RulesRegistryService::kDefaultRulesRegistryID;
+  if (has_webview) {
+    rules_registry_id = WebViewGuest::GetOrGenerateRulesRegistryID(
+        embedder_process_id, web_view_instance_id, browser_context());
+  }
 
   // The following call will return a NULL pointer for apps_shell, but should
   // never be called there anyways.
   rules_registry_ = RulesRegistryService::Get(browser_context())->
-      GetRulesRegistry(key, event_name);
+      GetRulesRegistry(rules_registry_id, event_name);
   DCHECK(rules_registry_.get());
   // Raw access to this function is not available to extensions, therefore
   // there should never be a request for a nonexisting rules registry.
   EXTENSION_FUNCTION_VALIDATE(rules_registry_.get());
 
   if (content::BrowserThread::CurrentlyOn(rules_registry_->owner_thread())) {
     bool success = RunAsyncOnCorrectThread();
     SendResponse(success);
   } else {
     scoped_refptr<base::MessageLoopProxy> message_loop_proxy =
@@ skipping 47 matching lines @@
   } else {
     rules_registry_->GetAllRules(extension_id(), &rules);
   }
 
   results_ = GetRules::Results::Create(rules);
 
   return true;
 }
 
 }  // namespace extensions