Refactoring and rewriting the chromoting jni instance to be chromoting session.

remoting/client/jni/jni_runtime_delegate.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_RUNTIME_DELEGATE_H_
 #define REMOTING_CLIENT_JNI_JNI_RUNTIME_DELEGATE_H_
 
 #include <jni.h>
 #include <string>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "remoting/base/auto_thread.h"
 #include "remoting/base/telemetry_log_writer.h"
 #include "remoting/client/chromoting_client_runtime.h"
-#include "remoting/client/jni/chromoting_jni_instance.h"
+#include "remoting/client/chromoting_session.h"
 #include "remoting/protocol/connection_to_host.h"
 
 namespace base {
 template <typename T>
 struct DefaultSingletonTraits;
 }
 
 namespace remoting {
 
 bool RegisterJniRuntimeDelegate(JNIEnv* env);
@@ skipping 10 matching lines @@
   static JniRuntimeDelegate* GetInstance();
 
   // Fetch OAuth token for the telemetry logger. Call on UI thread.
   void FetchAuthToken();
 
   // remoting::ChromotingClientRuntime::Delegate overrides.
   void RuntimeWillShutdown() override;
   void RuntimeDidShutdown() override;
   void RequestAuthTokenForLogger() override;
 
+  base::WeakPtr<ChromotingClientRuntime::Delegate> GetWeakPtr();
+
  private:
   JniRuntimeDelegate();
 
   // Forces a DisconnectFromHost() in case there is any active or failed
   // connection, then proceeds to tear down the Chromium dependencies on which
   // all sessions depended. Because destruction only occurs at application exit
   // after all connections have terminated, it is safe to make unretained
   // cross-thread calls on the class.
   ~JniRuntimeDelegate() override;
 
   // Detaches JVM from the current thread, then signals. Doesn't own |waiter|.
   void DetachFromVmAndSignal(base::WaitableEvent* waiter);
 
   ChromotingClientRuntime* runtime_;
 
+  base::WeakPtrFactory<ChromotingClientRuntime::Delegate> weak_factory_;
+
   friend struct base::DefaultSingletonTraits<JniRuntimeDelegate>;
 
   DISALLOW_COPY_AND_ASSIGN(JniRuntimeDelegate);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_JNI_JNI_RUNTIME_DELEGATE_H_