Fix screen.orientation.lock() rejection and an integration test.

content/browser/screen_orientation/screen_orientation_dispatcher_host.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/browser/screen_orientation/screen_orientation_dispatcher_host.h"
 
 #include "content/browser/screen_orientation/screen_orientation_provider.h"
 #include "content/common/screen_orientation_messages.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 65 matching lines @@
   ResetCurrentLock();
 }
 
 void ScreenOrientationDispatcherHost::NotifyLockError(
     int request_id, blink::WebLockOrientationError error) {
   RenderFrameHost* render_frame_host =
       GetRenderFrameHostForRequestID(request_id);
   if (!render_frame_host)
     return;
 
+  NotifyLockError(request_id, render_frame_host, error);
+}
+
+void ScreenOrientationDispatcherHost::NotifyLockError(
+    int request_id,
+    RenderFrameHost* render_frame_host,
+    blink::WebLockOrientationError error) {
   render_frame_host->Send(new ScreenOrientationMsg_LockError(
       render_frame_host->GetRoutingID(), request_id, error));
   ResetCurrentLock();
 }
 
 void ScreenOrientationDispatcherHost::OnOrientationChange() {
   if (provider_)
     provider_->OnOrientationChange();
 }
 
 void ScreenOrientationDispatcherHost::OnLockRequest(
     RenderFrameHost* render_frame_host,
     blink::WebScreenOrientationLockType orientation,
     int request_id) {
   if (current_lock_) {
-    NotifyLockError(current_lock_->request_id,
+    NotifyLockError(current_lock_->request_id, render_frame_host,
                     blink::WebLockOrientationErrorCanceled);
   }
 
   if (!provider_) {
-    NotifyLockError(request_id,
+    NotifyLockError(request_id, render_frame_host,
                     blink::WebLockOrientationErrorNotAvailable);
     return;
   }
 
   current_lock_ = new LockInformation(request_id,
                                       render_frame_host->GetProcess()->GetID(),
                                       render_frame_host->GetRoutingID());
 
   provider_->LockOrientation(request_id, orientation);
 }
 
 void ScreenOrientationDispatcherHost::OnUnlockRequest(
     RenderFrameHost* render_frame_host) {
   if (current_lock_) {
-    NotifyLockError(current_lock_->request_id,
+    NotifyLockError(current_lock_->request_id, render_frame_host,
                     blink::WebLockOrientationErrorCanceled);
   }
 
   if (!provider_)
     return;
 
   provider_->UnlockOrientation();
 }
 
 }  // namespace content