[ScreenOrientation] De-associate device.mojom.ScreenOrientation from legacy IPC channel.

content/browser/screen_orientation/screen_orientation_provider_unittest.cc

 // Copyright 2017 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.h"
 
 #include "base/optional.h"
 #include "base/run_loop.h"
 #include "content/common/frame_messages.h"
 #include "content/public/browser/screen_orientation_delegate.h"
@@ skipping 62 matching lines @@
     return fullscreened_contents_ && web_contents == fullscreened_contents_;
   }
 
  private:
   WebContents* fullscreened_contents_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(FakeWebContentsDelegate);
 };
 
 void LockResultCallback(base::Optional<ScreenOrientationLockResult>* out_result,
-                        ScreenOrientationLockResult result) {
+                        ScreenOrientationLockResult result,
+                        blink::WebScreenOrientationLockType lock) {
   *out_result = result;
 }
 
 }  // namespace
 
 class ScreenOrientationProviderTest : public RenderViewHostImplTestHarness {
  public:
   ScreenOrientationProviderTest() = default;
 
   void SetUp() override {
     content::RenderViewHostImplTestHarness::SetUp();
 
     contents()->SetDelegate(&wc_delegate_);
   }
 
   // Helpers for testing ScreenOrientationProvider methods.
   void CallLockAndGetResult(
       blink::WebScreenOrientationLockType orientation,
       base::Optional<ScreenOrientationLockResult>* out_result) {
-    contents()->GetScreenOrientationProviderForTesting()->LockOrientation(
+    contents()->GetScreenOrientationProvider()->LockOrientation(
         orientation, base::Bind(&LockResultCallback, out_result));
 
     base::RunLoop().RunUntilIdle();
   }
 
   void CallUnlock() {
-    contents()->GetScreenOrientationProviderForTesting()->UnlockOrientation();
+    contents()->GetScreenOrientationProvider()->UnlockOrientation();
   }
 
  private:
   FakeWebContentsDelegate wc_delegate_;
 };
 
 // Lock operation is not available.
 TEST_F(ScreenOrientationProviderTest, DelegateNotAvailableLockOnce) {
   // No ScreenOrientationDelegate.
   base::Optional<ScreenOrientationLockResult> result_1;
@@ skipping 213 matching lines @@
   contents()->NavigateAndCommit(another_url);
   // The pending lock request is cancelled.
   EXPECT_EQ(ScreenOrientationLockResult::
                 SCREEN_ORIENTATION_LOCK_RESULT_ERROR_CANCELED,
             result);
   // Delegate did apply unlock once.
   EXPECT_EQ(1, delegate.unlock_count());
 }
 
 }  // namespace content