Refactoring out the chromoting jni runtime class in favor of chromoting client runtime.

remoting/client/chromoting_client_runtime.h

 // Copyright 2016 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_CHROMOTING_CLIENT_RUNTIME_H_
 #define REMOTING_CLIENT_CHROMOTING_CLIENT_RUNTIME_H_
 
 #include <memory>
 
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/singleton.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "remoting/base/auto_thread.h"
+#include "remoting/base/telemetry_log_writer.h"
 
 namespace base {
 class MessageLoopForUI;
+
+template <typename T>
+struct DefaultSingletonTraits;

[Sergey Ulanov, 2017/03/14 19:09:37]

Do you need this, given that this file includes base/singleton.h?

[nicholss, 2017/03/14 22:56:44]

I was not suppose to have base/singleton in this h file, removed in include.

 }  // namespace base
 
 // Houses the global resources on which the Chromoting components run
 // (e.g. message loops and task runners).
 namespace remoting {
 
 class ChromotingClientRuntime {
  public:
-  // Caller to create is responsible for creating and attaching a new ui thread
-  // for use. Example:
-  //
-  // On Android, the UI thread is managed by Java, so we need to attach and
-  // start a special type of message loop to allow Chromium code to run tasks.
-  //
-  //  base::MessageLoopForUI *ui_loop = new base::MessageLoopForUI();
-  //  ui_loop_->Start();
-  //  std::unique_ptr<ChromotingClientRuntime> runtime =
-  //    ChromotingClientRuntime::Create(ui_loop);
-  //
-  // On iOS we created a new message loop and now attach it.
-  //
-  //  base::MessageLoopForUI *ui_loop = new base::MessageLoopForUI();
-  //  ui_loop_->Attach();
-  //  std::unique_ptr<ChromotingClientRuntime> runtime =
-  //    ChromotingClientRuntime::Create(ui_loop);
-  //
-  static std::unique_ptr<ChromotingClientRuntime> Create(
-      base::MessageLoopForUI* ui_loop);
+  class Delegate {
+   public:
+    virtual ~Delegate() {}
 
-  ~ChromotingClientRuntime();
+    virtual void RuntimeWillShutdown() = 0;
+    virtual void RuntimeDidShutdown() = 0;
+    virtual void RequestAuthTokenForLogger() = 0;
+  };
+
+  static ChromotingClientRuntime* GetInstance();
+
+  void SetDelegate(ChromotingClientRuntime::Delegate* delegate);
 
   scoped_refptr<AutoThreadTaskRunner> network_task_runner() {
     return network_task_runner_;
   }
 
   scoped_refptr<AutoThreadTaskRunner> ui_task_runner() {
     return ui_task_runner_;
   }
 
   scoped_refptr<AutoThreadTaskRunner> display_task_runner() {
     return display_task_runner_;
   }
 
   scoped_refptr<AutoThreadTaskRunner> file_task_runner() {
     return file_task_runner_;
   }
 
   scoped_refptr<net::URLRequestContextGetter> url_requester() {
     return url_requester_;
   }
 
+  // TODO(nicholss): This should return a base::weak_ptr<TelemetryLogWriter>

[Sergey Ulanov, 2017/03/14 19:09:37]

This class owns the log_writer, so I think returning a pointer is appropriate.

[nicholss, 2017/03/14 22:56:44]

Ok thanks

[Yuwei, 2017/03/16 08:38:53]

WeakPtr is not necessary as long as the runtime dies after anything else.

+  // At some point the application should set the auth closure when auth is
+  // possible.
+  // TODO(nicholss): GetLogWriter is not like the above methods, change to

[Sergey Ulanov, 2017/03/14 19:09:37]

Yes, log_writer() would be a better name

[nicholss, 2017/03/14 22:56:44]

Done.

+  // log_writer?
+  TelemetryLogWriter* GetLogWriter();

[Sergey Ulanov, 2017/03/14 19:09:37]

Unlike other stuff this class stores the log writer is not thread-safe. Explain
in the comments that this the log writer must be used only on network thread?

[Sergey Ulanov, 2017/03/14 19:09:37]

Change return type to ChromotingEventLogWriter

[nicholss, 2017/03/14 22:56:44]

Done.

[nicholss, 2017/03/14 22:56:44]

Done.

+
  private:
   ChromotingClientRuntime();
-  ChromotingClientRuntime(
-      scoped_refptr<AutoThreadTaskRunner> ui_task_runner,
-      scoped_refptr<AutoThreadTaskRunner> display_task_runner,
-      scoped_refptr<AutoThreadTaskRunner> network_task_runner,
-      scoped_refptr<AutoThreadTaskRunner> file_task_runner,
-      scoped_refptr<net::URLRequestContextGetter> url_requester);
+  virtual ~ChromotingClientRuntime();
+
+  void CreateLogWriter();
+  void RequestAuthTokenForLogger();
+
+  // Chromium code's connection to the app message loop. Once created the
+  // MessageLoop will live for the life of the program.
+  std::unique_ptr<base::MessageLoopForUI> ui_loop_;
 
   // References to native threads.
   scoped_refptr<AutoThreadTaskRunner> ui_task_runner_;
 
   scoped_refptr<AutoThreadTaskRunner> display_task_runner_;
   scoped_refptr<AutoThreadTaskRunner> network_task_runner_;
   scoped_refptr<AutoThreadTaskRunner> file_task_runner_;
 
   scoped_refptr<net::URLRequestContextGetter> url_requester_;
 
+  // For logging session stage changes and stats.
+  std::unique_ptr<TelemetryLogWriter> log_writer_;
+
+  ChromotingClientRuntime::Delegate* delegate_;
+
+  friend struct base::DefaultSingletonTraits<ChromotingClientRuntime>;
+
   DISALLOW_COPY_AND_ASSIGN(ChromotingClientRuntime);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_CHROMOTING_CLIENT_RUNTIME_H_