Remove origins from the LockManager interface messages.

Bug: 779444
Change-Id: I9c56fc78c1eb622e55abe28cb97a53cbab6d60df
Reviewed-on: https://chromium-review.googlesource.com/832288Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Joshua Bell <jsbell@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Sam McNally <sammc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#525251}

content/browser/locks/lock_manager.cc

@@ -89,18 +89,19 @@ void LockManager::OriginState::MergeLockState(const std::string& name,
   (mode == LockMode::SHARED ? shared : exclusive).insert(name);
 }
 
-void LockManager::CreateService(blink::mojom::LockManagerRequest request) {
+void LockManager::CreateService(blink::mojom::LockManagerRequest request,
+                                const url::Origin& origin) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  bindings_.AddBinding(this, std::move(request));
+  bindings_.AddBinding(this, std::move(request), origin);
 }
 
-void LockManager::RequestLock(const url::Origin& origin,
-                              const std::string& name,
+void LockManager::RequestLock(const std::string& name,
                               LockMode mode,
                               WaitMode wait,
                               blink::mojom::LockRequestPtr request) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
+  const url::Origin& origin = bindings_.dispatch_context();
   if (wait == WaitMode::NO_WAIT && !IsGrantable(origin, name, mode)) {
     request->Failed();
     return;

content/browser/locks/lock_manager.h

@@ -27,12 +27,12 @@ class LockManager : public base::RefCountedThreadSafe<LockManager>,
  public:
   LockManager();
 
-  void CreateService(blink::mojom::LockManagerRequest request);
+  void CreateService(blink::mojom::LockManagerRequest request,
+                     const url::Origin& origin);
 
   // Request a lock. When the lock is acquired, |callback| will be invoked with
   // a LockHandle.
-  void RequestLock(const url::Origin& origin,
-                   const std::string& name,
+  void RequestLock(const std::string& name,
                    LockMode mode,
                    WaitMode wait,
                    blink::mojom::LockRequestPtr request) override;
@@ -73,7 +73,7 @@ class LockManager : public base::RefCountedThreadSafe<LockManager>,
   // to process outstanding requests within the origin.
   void ProcessRequests(const url::Origin& origin);
 
-  mojo::BindingSet<blink::mojom::LockManager> bindings_;
+  mojo::BindingSet<blink::mojom::LockManager, url::Origin> bindings_;
 
   int64_t next_lock_id = 1;
   std::map<url::Origin, OriginState> origins_;

content/browser/renderer_interface_binders.cc

@@ -149,7 +149,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
          const url::Origin& origin) {
         static_cast<StoragePartitionImpl*>(host->GetStoragePartition())
             ->GetLockManager()
-            ->CreateService(std::move(request));
+            ->CreateService(std::move(request), origin);
       }));
   parameterized_binder_registry_.AddInterface(
       base::Bind(&CreateDedicatedWorkerHostFactory));

third_party/WebKit/Source/modules/locks/LockManager.cpp

@@ -187,9 +187,7 @@ ScriptPromise LockManager::acquire(ScriptState* script_state,
   AddPendingRequest(new LockRequestImpl(callback, resolver, name, mode,
                                         mojo::MakeRequest(&request_ptr), this));
 
-  service_->RequestLock(
-      ExecutionContext::From(script_state)->GetSecurityOrigin(), name, mode,
-      wait, std::move(request_ptr));
+  service_->RequestLock(name, mode, wait, std::move(request_ptr));
 
   return promise;
 }

third_party/WebKit/public/platform/modules/locks/lock_manager.mojom

@@ -4,8 +4,6 @@
 
 module blink.mojom;
 
-import "url/mojo/origin.mojom";
-
 // An opaque handle passed from the browser process to a child process to
 // reflect a held lock. The lock is released when the handle is dropped.
 interface LockHandle {};
@@ -46,8 +44,7 @@ interface LockManager {
     NO_WAIT
   };
 
-  RequestLock(url.mojom.Origin origin,
-              string name,
+  RequestLock(string name,
               LockMode mode,
               WaitMode wait,
               LockRequest request);