Revert of [Android Client] Move session-scoped native interface into JniClient

remoting/client/jni/jni_frame_consumer.h

 // Copyright 2013 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.
 
 #ifndef REMOTING_CLIENT_JNI_JNI_FRAME_CONSUMER_H_
 #define REMOTING_CLIENT_JNI_JNI_FRAME_CONSUMER_H_
 
 #include <list>
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "remoting/protocol/frame_consumer.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 
 namespace remoting {
 
 class ChromotingJniRuntime;
-class JniClient;
 
 // FrameConsumer implementation that draws onto a JNI direct byte buffer.
 class JniFrameConsumer : public protocol::FrameConsumer {
  public:
   // Does not take ownership of |jni_runtime|.
-  JniFrameConsumer(ChromotingJniRuntime* jni_runtime, JniClient* client);
+  explicit JniFrameConsumer(ChromotingJniRuntime* jni_runtime);
 
   ~JniFrameConsumer() override;
 
   // FrameConsumer implementation.
   std::unique_ptr<webrtc::DesktopFrame> AllocateFrame(
       const webrtc::DesktopSize& size) override;
   void DrawFrame(std::unique_ptr<webrtc::DesktopFrame> frame,
                  const base::Closure& done) override;
   PixelFormat GetPixelFormat() override;
 
  private:
   class Renderer;
 
   void OnFrameRendered(const base::Closure& done);
 
   // Used to obtain task runner references and make calls to Java methods.
   ChromotingJniRuntime* jni_runtime_;
 
   // Renderer object used to render the frames on the display thread.
   std::unique_ptr<Renderer> renderer_;
 
   base::WeakPtrFactory<JniFrameConsumer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(JniFrameConsumer);
 };
 
 }  // namespace remoting
 
 #endif