[screen-orientation] Don't always unlock when fullscreen state is left.

content/browser/screen_orientation/screen_orientation_provider_android.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_provider_android.h"
 
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/screen_orientation/screen_orientation_dispatcher_host.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 103 matching lines @@
 
   if (LockMatchesCurrentOrientation(pending_lock_->lock)) {
     dispatcher_->NotifyLockSuccess(pending_lock_->request_id);
     delete pending_lock_;
     pending_lock_ = NULL;
   }
 }
 
 void ScreenOrientationProviderAndroid::DidToggleFullscreenModeForTab(
     bool entered_fullscreen) {
-  if (lock_applied_) {
-    DCHECK(!entered_fullscreen);
-    UnlockOrientation();
-  }
+  if (!lock_applied_)
+    return;
+
+  // If fullscreen is not required in order to lock orientation, don't unlock
+  // when fullscreen state changes.
+  ContentViewCoreImpl* cvc =
+      ContentViewCoreImpl::FromWebContents(web_contents());
+  if (cvc && !cvc->IsFullscreenRequiredForOrientationLock())
+    return;
+
+  DCHECK(!entered_fullscreen);
+  UnlockOrientation();
 }
 
 bool ScreenOrientationProviderAndroid::LockMatchesCurrentOrientation(
     blink::WebScreenOrientationLockType lock_orientation) {
   if (!web_contents()->GetRenderViewHost())
     return false;
 
   RenderWidgetHost* rwh = web_contents()->GetRenderViewHost();
   blink::WebScreenInfo screen_info;
   rwh->GetWebScreenInfo(&screen_info);
@@ skipping 79 matching lines @@
 }
 
 // static
 ScreenOrientationProvider* ScreenOrientationProvider::Create(
     ScreenOrientationDispatcherHost* dispatcher,
     WebContents* web_contents) {
   return new ScreenOrientationProviderAndroid(dispatcher, web_contents);
 }
 
 } // namespace content