Remove WebViewKey in rules registry.

extensions/browser/guest_view/web_view/web_view_guest.h

 // Copyright 2014 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.
 
 #ifndef EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
 #define EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
 
 #include <vector>
 
 #include "base/observer_list.h"
@@ skipping 39 matching lines @@
                                              std::string* partition_domain,
                                              std::string* partition_name,
                                              bool* in_memory);
 
   // Returns guestview::kInstanceIDNone if |contents| does not correspond to a
   // WebViewGuest.
   static int GetViewInstanceId(content::WebContents* contents);
 
   static const char Type[];
 
+  // Return the stored rules registry ID of the given webview. Will generate
+  // an ID for the first query.
+  static int GetOrGenerateRulesRegistryID(
+      int embedder_process_id,
+      int webview_instance_id,

[Fady Samuel, 2014/11/28 11:34:25]

nit: web_view_instance_id to be more consistent with spacing in this file

[Xi Han, 2014/11/28 16:12:57]

Done. 

+      content::BrowserContext* browser_context);
+
   // Request navigating the guest to the provided |src| URL.
   void NavigateGuest(const std::string& src, bool force_navigation);
 
   // Shows the context menu for the guest.
   // |items| acts as a filter. This restricts the current context's default
   // menu items to contain only the items from |items|.
   // |items| == NULL means no filtering will be applied.
   void ShowContextMenu(
       int request_id,
       const WebViewGuestDelegate::MenuItemVector* items);
@@ skipping 159 matching lines @@
   // Partition data that are newer than |removal_since| will be removed.
   // |removal_mask| corresponds to bitmask in StoragePartition::RemoveDataMask.
   bool ClearData(const base::Time remove_since,
                  uint32 removal_mask,
                  const base::Closure& callback);
 
   ScriptExecutor* script_executor() { return script_executor_.get(); }
 
  private:
   friend class WebViewPermissionHelper;
+
   WebViewGuest(content::BrowserContext* browser_context,
                int guest_instance_id);
 
   ~WebViewGuest() override;
 
   void AttachWebViewHelpers(content::WebContents* contents);
 
   void OnWebViewNewWindowResponse(int new_window_instance_id,
                                   bool allow,
                                   const std::string& user_input);
@@ skipping 59 matching lines @@
   // Creates a new guest window owned by this WebViewGuest.
   void CreateNewGuestWebViewWindow(const content::OpenURLParams& params);
 
   void NewGuestWebViewCallback(const content::OpenURLParams& params,
                                content::WebContents* guest_web_contents);
 
   bool HandleKeyboardShortcuts(const content::NativeWebKeyboardEvent& event);
 
   void SetUpAutoSize();
 
+  // Store the ID of this webview in the RulesRegistryService.

[Fady Samuel, 2014/11/28 11:34:25]

nit:

// Identifies the set of rules registries belonging to this guest.

[Xi Han, 2014/11/28 16:12:57]

Done.

+  int rules_registry_id_;
+
   // Handles find requests and replies for the webview find API.
   WebViewFindHelper find_helper_;
 
   ObserverList<ScriptExecutionObserver> script_observers_;
   scoped_ptr<ScriptExecutor> script_executor_;
 
   content::NotificationRegistrar notification_registrar_;
 
   // True if the user agent is overridden.
   bool is_overriding_user_agent_;
@@ skipping 33 matching lines @@
   // This is used to ensure pending tasks will not fire after this object is
   // destroyed.
   base::WeakPtrFactory<WebViewGuest> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebViewGuest);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_