Reland ScreenOrientationDelegate on ChromeOS

content/public/browser/screen_orientation_provider.cc

 // 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.
 
 #include "content/public/browser/screen_orientation_provider.h"
 
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/screen_orientation_delegate.h"
 #include "content/public/browser/screen_orientation_dispatcher_host.h"
@@ skipping 55 matching lines @@
     lock_orientation = GetNaturalLockType();
     if (lock_orientation == blink::WebScreenOrientationLockDefault) {
       // We are in a broken state, let's pretend we got canceled.
       dispatcher_->NotifyLockError(request_id,
                                    blink::WebLockOrientationErrorCanceled);
       return;
     }
   }
 
   lock_applied_ = true;
-  delegate_->Lock(lock_orientation);
+  delegate_->Lock(web_contents(), lock_orientation);
 
   // If two calls happen close to each other some platforms will ignore the
   // first. A successful lock will be once orientation matches the latest
   // request.
   pending_lock_.reset();
 
   // If the orientation we are locking to matches the current orientation, we
   // should succeed immediately.
   if (LockMatchesCurrentOrientation(lock_orientation)) {
     dispatcher_->NotifyLockSuccess(request_id);
     return;
   }
 
   pending_lock_.reset(new LockInformation(request_id, lock_orientation));
 }
 
 void ScreenOrientationProvider::UnlockOrientation() {
   if (!lock_applied_ || !delegate_)
     return;
 
-  delegate_->Unlock();
+  delegate_->Unlock(web_contents());
 
   lock_applied_ = false;
   pending_lock_.reset();
 }
 
 void ScreenOrientationProvider::OnOrientationChange() {
   if (!pending_lock_.get())
     return;
 
   if (LockMatchesCurrentOrientation(pending_lock_->lock)) {
@@ skipping 92 matching lines @@
     case blink::WebScreenOrientationLockDefault:
       NOTREACHED();
       return false;
   }
 
   NOTREACHED();
   return false;
 }
 
 } // namespace content