Remove unnused originatedInProcess parameter in blink::WebStorageEventDispatcher.

BUG=586194

Review URL: https://codereview.chromium.org/1742863002

Cr-Commit-Position: refs/heads/master@{#378072}

5 files changed, 13 insertions, 19 deletions

diff --git a/content/renderer/dom_storage/dom_storage_dispatcher.cc b/content/renderer/dom_storage/dom_storage_dispatcher.cc
index 29dbb04..c80df04 100644
--- a/content/renderer/dom_storage/dom_storage_dispatcher.cc
+++ b/content/renderer/dom_storage/dom_storage_dispatcher.cc
@@ -301,9 +301,8 @@ void DomStorageDispatcher::OnStorageEvent(
     const DOMStorageMsg_Event_Params& params) {
   RenderThreadImpl::current()->EnsureWebKitInitialized();
 
-  bool originated_in_process = params.connection_id != 0;
   WebStorageAreaImpl* originating_area = NULL;
-  if (originated_in_process) {
+  if (params.connection_id) {
     originating_area = WebStorageAreaImpl::FromConnectionId(
         params.connection_id);
   } else {
@@ -320,8 +319,7 @@ void DomStorageDispatcher::OnStorageEvent(
         params.new_value,
         params.origin,
         params.page_url,
-        originating_area,
-        originated_in_process);
+        originating_area);
   } else {
     WebStorageNamespaceImpl
         session_namespace_for_event_dispatch(params.namespace_id);
@@ -332,8 +330,7 @@ void DomStorageDispatcher::OnStorageEvent(
         params.origin,
         params.page_url,
         session_namespace_for_event_dispatch,
-        originating_area,
-        originated_in_process);
+        originating_area);
   }
 }
 
diff --git a/third_party/WebKit/Source/modules/storage/StorageArea.cpp b/third_party/WebKit/Source/modules/storage/StorageArea.cpp
index 35e82b6..fae4403 100644
--- a/third_party/WebKit/Source/modules/storage/StorageArea.cpp
+++ b/third_party/WebKit/Source/modules/storage/StorageArea.cpp
@@ -159,7 +159,7 @@ size_t StorageArea::memoryBytesUsedByCache()
     return m_storageArea->memoryBytesUsedByCache();
 }
 
-void StorageArea::dispatchLocalStorageEvent(const String& key, const String& oldValue, const String& newValue, SecurityOrigin* securityOrigin, const KURL& pageURL, WebStorageArea* sourceAreaInstance, bool originatedInProcess)
+void StorageArea::dispatchLocalStorageEvent(const String& key, const String& oldValue, const String& newValue, SecurityOrigin* securityOrigin, const KURL& pageURL, WebStorageArea* sourceAreaInstance)
 {
     // Iterate over all pages that have a StorageNamespaceController supplement.
     for (Page* page : Page::ordinaryPages()) {
@@ -190,7 +190,7 @@ static Page* findPageWithSessionStorageNamespace(const WebStorageNamespace& sess
     return nullptr;
 }
 
-void StorageArea::dispatchSessionStorageEvent(const String& key, const String& oldValue, const String& newValue, SecurityOrigin* securityOrigin, const KURL& pageURL, const WebStorageNamespace& sessionNamespace, WebStorageArea* sourceAreaInstance, bool originatedInProcess)
+void StorageArea::dispatchSessionStorageEvent(const String& key, const String& oldValue, const String& newValue, SecurityOrigin* securityOrigin, const KURL& pageURL, const WebStorageNamespace& sessionNamespace, WebStorageArea* sourceAreaInstance)
 {
     Page* page = findPageWithSessionStorageNamespace(sessionNamespace);
     if (!page)
diff --git a/third_party/WebKit/Source/modules/storage/StorageArea.h b/third_party/WebKit/Source/modules/storage/StorageArea.h
index 6415753..eed3283 100644
--- a/third_party/WebKit/Source/modules/storage/StorageArea.h
+++ b/third_party/WebKit/Source/modules/storage/StorageArea.h
@@ -68,10 +68,9 @@ public:
     size_t memoryBytesUsedByCache();
 
     static void dispatchLocalStorageEvent(const String& key, const String& oldValue, const String& newValue,
-        SecurityOrigin*, const KURL& pageURL, WebStorageArea* sourceAreaInstance, bool originatedInProcess);
+        SecurityOrigin*, const KURL& pageURL, WebStorageArea* sourceAreaInstance);
     static void dispatchSessionStorageEvent(const String& key, const String& oldValue, const String& newValue,
-        SecurityOrigin*, const KURL& pageURL, const WebStorageNamespace&,
-        WebStorageArea* sourceAreaInstance, bool originatedInProcess);
+        SecurityOrigin*, const KURL& pageURL, const WebStorageNamespace&, WebStorageArea* sourceAreaInstance);
 
     DECLARE_TRACE();
 
diff --git a/third_party/WebKit/Source/web/WebStorageEventDispatcherImpl.cpp b/third_party/WebKit/Source/web/WebStorageEventDispatcherImpl.cpp
index 8888ac4..c0a333f 100644
--- a/third_party/WebKit/Source/web/WebStorageEventDispatcherImpl.cpp
+++ b/third_party/WebKit/Source/web/WebStorageEventDispatcherImpl.cpp
@@ -42,25 +42,24 @@ namespace blink {
 void WebStorageEventDispatcher::dispatchLocalStorageEvent(
         const WebString& key, const WebString& oldValue,
         const WebString& newValue, const WebURL& origin,
-        const WebURL& pageURL, WebStorageArea* sourceAreaInstance,
-        bool originatedInProcess)
+        const WebURL& pageURL, WebStorageArea* sourceAreaInstance)
 {
     RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(origin);
     StorageArea::dispatchLocalStorageEvent(
             key, oldValue, newValue, securityOrigin.get(), pageURL,
-            sourceAreaInstance, originatedInProcess);
+            sourceAreaInstance);
 }
 
 void WebStorageEventDispatcher::dispatchSessionStorageEvent(
         const WebString& key, const WebString& oldValue,
         const WebString& newValue, const WebURL& origin,
         const WebURL& pageURL, const WebStorageNamespace& sessionNamespace,
-        WebStorageArea* sourceAreaInstance, bool originatedInProcess)
+        WebStorageArea* sourceAreaInstance)
 {
     RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(origin);
     StorageArea::dispatchSessionStorageEvent(
             key, oldValue, newValue, securityOrigin.get(), pageURL,
-            sessionNamespace, sourceAreaInstance, originatedInProcess);
+            sessionNamespace, sourceAreaInstance);
 }
 
 } // namespace blink
diff --git a/third_party/WebKit/public/web/WebStorageEventDispatcher.h b/third_party/WebKit/public/web/WebStorageEventDispatcher.h
index aa681fd..4090e88 100644
--- a/third_party/WebKit/public/web/WebStorageEventDispatcher.h
+++ b/third_party/WebKit/public/web/WebStorageEventDispatcher.h
@@ -45,15 +45,14 @@ public:
     BLINK_EXPORT static void dispatchLocalStorageEvent(
             const WebString& key, const WebString& oldValue,
             const WebString& newValue, const WebURL& origin,
-            const WebURL& pageUrl, WebStorageArea* sourceAreaInstance,
-            bool originatedInProcess);
+            const WebURL& pageUrl, WebStorageArea* sourceAreaInstance);
 
     // Dispatch a session storage event to appropiate documents.
     BLINK_EXPORT static void dispatchSessionStorageEvent(
             const WebString& key, const WebString& oldValue,
             const WebString& newValue, const WebURL& origin,
             const WebURL& pageUrl, const WebStorageNamespace&,
-            WebStorageArea* sourceAreaInstance, bool originatedInProcess);
+            WebStorageArea* sourceAreaInstance);
 
 private:
     WebStorageEventDispatcher() { }