Add assigner support to Blimp

blimp/client/session/blimp_client_session.h

 // 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.
 
 #ifndef BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_
 #define BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 24 matching lines @@
 // BlimpClientSession represents a single active session of Blimp on the client
 // regardless of whether or not the client application is in the background or
 // foreground.  The only time this session is invalid is during initialization
 // and shutdown of this particular client process (or Activity on Android).
 //
 // This session glues together the feature proxy components and the network
 // layer.  The network components must be interacted with on the IO thread.  The
 // feature proxies must be interacted with on the UI thread.
 class BLIMP_CLIENT_EXPORT BlimpClientSession {
  public:
-  explicit BlimpClientSession(scoped_ptr<AssignmentSource> assignment_source);
+  BlimpClientSession();
 
   // Uses the AssignmentSource to get an Assignment and then uses the assignment
   // configuration to connect to the Blimplet.
-  void Connect();
+  // |token| is the login authentication token to use when querying for an
+  // assignment.
+  void Connect(const std::string& token);

[Kevin M, 2016/02/12 19:45:27]

auth_token to distinguish it from other tokens

[David Trainor- moved to gerrit, 2016/02/17 21:09:48]

Done.

 
   TabControlFeature* GetTabControlFeature() const;
   NavigationFeature* GetNavigationFeature() const;
   RenderWidgetFeature* GetRenderWidgetFeature() const;
 
+  // The AssignmentCallback for when an assignment is ready. This will trigger
+  // a connection to the engine.
+  virtual void ConnectWithAssignment(AssignmentSourceResult result,
+                                     const Assignment& assignment);
+
  protected:
   virtual ~BlimpClientSession();
 
  private:
   // Registers a message processor which will receive all messages of the |type|
   // specified.  Returns a BlimpMessageProcessor object for sending messages of
   // type |type|.
   scoped_ptr<BlimpMessageProcessor> RegisterFeature(
       BlimpMessage::Type type,
       BlimpMessageProcessor* incoming_processor);
 
-  // The AssignmentCallback for when an assignment is ready. This will trigger
-  // a connection to the engine.
-  void ConnectWithAssignment(const Assignment& assignment);
-
-  // The AssignmentSource is used when the user of BlimpClientSession calls
-  // Connect() to get a valid assignment and later connect to the engine.
-  scoped_ptr<AssignmentSource> assignment_source_;
-
   base::Thread io_thread_;
   scoped_ptr<TabControlFeature> tab_control_feature_;
   scoped_ptr<NavigationFeature> navigation_feature_;
   scoped_ptr<RenderWidgetFeature> render_widget_feature_;
 
+  // The AssignmentSource is used when the user of BlimpClientSession calls
+  // Connect() to get a valid assignment and later connect to the engine.
+  scoped_ptr<AssignmentSource> assignment_source_;
+
   // Container struct for network components.
   // Must be deleted on the IO thread.
   scoped_ptr<ClientNetworkComponents> net_components_;
 
   // Pipes for receiving BlimpMessages from IO thread.
   // Incoming messages are only routed to the UI thread since all features run
   // on the UI thread.
   std::vector<scoped_ptr<BlimpMessageThreadPipe>> incoming_pipes_;
 
   base::WeakPtrFactory<BlimpClientSession> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpClientSession);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_