Reland: Added a debug info UI for Blimp

blimp/client/session/blimp_client_session.cc

 // Copyright 2015 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 "blimp/client/session/blimp_client_session.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
@@ skipping 54 matching lines @@
 };
 
 }  // namespace
 
 // This class's functions and destruction are all invoked on the IO thread by
 // the BlimpClientSession.
 class ClientNetworkComponents : public ConnectionHandler,
                                 public ConnectionErrorObserver {
  public:
   // Can be created on any thread.
-  explicit ClientNetworkComponents(
-      std::unique_ptr<NetworkEventObserver> observer);
+  ClientNetworkComponents(
+      std::unique_ptr<NetworkEventObserver> observer,
+      std::unique_ptr<BlimpConnectionStatistics> blimp_connection_statistics);
   ~ClientNetworkComponents() override;
 
   // Sets up network components.
   void Initialize();
 
   // Starts the connection to the engine using the given |assignment|.
   // It is required to first call Initialize.
   void ConnectWithAssignment(const Assignment& assignment);
 
   BrowserConnectionHandler* GetBrowserConnectionHandler();
 
  private:
   // ConnectionHandler implementation.
   void HandleConnection(std::unique_ptr<BlimpConnection> connection) override;
 
   // ConnectionErrorObserver implementation.
   void OnConnectionError(int error) override;
 
   std::unique_ptr<BrowserConnectionHandler> connection_handler_;
   std::unique_ptr<ClientConnectionManager> connection_manager_;
   std::unique_ptr<NetworkEventObserver> network_observer_;
+  std::unique_ptr<BlimpConnectionStatistics> connection_statistics_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientNetworkComponents);
 };
 
 ClientNetworkComponents::ClientNetworkComponents(
-    std::unique_ptr<NetworkEventObserver> network_observer)
+    std::unique_ptr<NetworkEventObserver> network_observer,
+    std::unique_ptr<BlimpConnectionStatistics> statistics)
     : connection_handler_(new BrowserConnectionHandler),
-      network_observer_(std::move(network_observer)) {}
+      network_observer_(std::move(network_observer)),
+      connection_statistics_(std::move(statistics)) {
+  DCHECK(connection_statistics_);
+}
 
 ClientNetworkComponents::~ClientNetworkComponents() {}
 
 void ClientNetworkComponents::Initialize() {
   DCHECK(!connection_manager_);
   connection_manager_ = base::WrapUnique(new ClientConnectionManager(this));
 }
 
 void ClientNetworkComponents::ConnectWithAssignment(
     const Assignment& assignment) {
   DCHECK(connection_manager_);
 
   connection_manager_->set_client_token(assignment.client_token);
   const char* transport_type = "UNKNOWN";
   switch (assignment.transport_protocol) {
     case Assignment::SSL:
       DCHECK(assignment.cert);
       connection_manager_->AddTransport(base::WrapUnique(new SSLClientTransport(
-          assignment.engine_endpoint, std::move(assignment.cert), nullptr)));
+          assignment.engine_endpoint, std::move(assignment.cert),
+          connection_statistics_.get(), nullptr)));
       transport_type = "SSL";
       break;
     case Assignment::TCP:
-      connection_manager_->AddTransport(base::WrapUnique(
-          new TCPClientTransport(assignment.engine_endpoint, nullptr)));
+      connection_manager_->AddTransport(base::WrapUnique(new TCPClientTransport(
+          assignment.engine_endpoint, connection_statistics_.get(), nullptr)));
       transport_type = "TCP";
       break;
     case Assignment::UNKNOWN:
       LOG(FATAL) << "Unknown transport type.";
       break;
   }
 
   VLOG(1) << "Connecting to " << assignment.engine_endpoint.ToString() << " ("
           << transport_type << ")";
 
@@ skipping 19 matching lines @@
 }
 
 BlimpClientSession::BlimpClientSession(const GURL& assigner_endpoint)
     : io_thread_("BlimpIOThread"),
       tab_control_feature_(new TabControlFeature),
       navigation_feature_(new NavigationFeature),
       ime_feature_(new ImeFeature),
       render_widget_feature_(new RenderWidgetFeature),
       settings_feature_(new SettingsFeature),
       weak_factory_(this) {
-  net_components_.reset(new ClientNetworkComponents(
-      base::WrapUnique(new CrossThreadNetworkEventObserver(
-          weak_factory_.GetWeakPtr(),
-          base::SequencedTaskRunnerHandle::Get()))));
   base::Thread::Options options;
   options.message_loop_type = base::MessageLoop::TYPE_IO;
   io_thread_.StartWithOptions(options);
+  blimp_connection_statistics_ = new BlimpConnectionStatistics();
+  net_components_.reset(new ClientNetworkComponents(
+      base::WrapUnique(new CrossThreadNetworkEventObserver(
+          weak_factory_.GetWeakPtr(), base::SequencedTaskRunnerHandle::Get())),
+      base::WrapUnique(blimp_connection_statistics_)));
 
   assignment_source_.reset(new AssignmentSource(
       assigner_endpoint, io_thread_.task_runner(), io_thread_.task_runner()));
 
   RegisterFeatures();
 
   // Initialize must only be posted after the RegisterFeature calls have
   // completed.
   io_thread_.task_runner()->PostTask(
       FROM_HERE, base::Bind(&ClientNetworkComponents::Initialize,
@@ skipping 85 matching lines @@
 }
 
 RenderWidgetFeature* BlimpClientSession::GetRenderWidgetFeature() const {
   return render_widget_feature_.get();
 }
 
 SettingsFeature* BlimpClientSession::GetSettingsFeature() const {
   return settings_feature_.get();
 }
 
+BlimpConnectionStatistics* BlimpClientSession::GetBlimpConnectionStatistics()
+    const {
+  return blimp_connection_statistics_;
+}
+
 }  // namespace client
 }  // namespace blimp