Make ScreenOrientationProvider (Java) a bag of static methods.

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 51 matching lines @@
   if (lock_orientation == blink::WebScreenOrientationLockNatural) {
     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;
     }
   }
 
-  if (j_screen_orientation_provider_.is_null()) {
-    j_screen_orientation_provider_.Reset(Java_ScreenOrientationProvider_create(
-        base::android::AttachCurrentThread()));
-  }
-
   lock_applied_ = true;
   Java_ScreenOrientationProvider_lockOrientation(
-      base::android::AttachCurrentThread(),
-      j_screen_orientation_provider_.obj(), lock_orientation);
+      base::android::AttachCurrentThread(), lock_orientation);
 
   // If two calls happen close to each other, Android will ignore the first.
   if (pending_lock_) {
     delete pending_lock_;
     pending_lock_ = NULL;
   }
 
   // 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_ = new LockInformation(request_id, lock_orientation);
 }
 
 void ScreenOrientationProviderAndroid::UnlockOrientation() {
   if (!lock_applied_)
     return;
 
-  // j_screen_orientation_provider_ was set when locking so it can't be null.
-  DCHECK(!j_screen_orientation_provider_.is_null());
-
   Java_ScreenOrientationProvider_unlockOrientation(
-      base::android::AttachCurrentThread(),
-      j_screen_orientation_provider_.obj());
+      base::android::AttachCurrentThread());
   lock_applied_ = false;
 }
 
 void ScreenOrientationProviderAndroid::OnOrientationChange() {
   if (!pending_lock_)
     return;
 
   if (LockMatchesCurrentOrientation(pending_lock_->lock)) {
     dispatcher_->NotifyLockSuccess(pending_lock_->request_id);
     delete pending_lock_;
@@ skipping 95 matching lines @@
 }
 
 // static
 ScreenOrientationProvider* ScreenOrientationProvider::Create(
     ScreenOrientationDispatcherHost* dispatcher,
     WebContents* web_contents) {
   return new ScreenOrientationProviderAndroid(dispatcher, web_contents);
 }
 
 } // namespace content