Get view manager client lib unit test harness to run again. Does not get any individual tests worki…

mojo/services/public/cpp/view_manager/view_manager.h

 // Copyright 2014 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 MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_H_
 #define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
+#include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/services/public/cpp/view_manager/view_tree_node.h"
 
 namespace mojo {
 class Application;
 namespace view_manager {
 
 class View;
 class ViewManagerSynchronizer;
 class ViewTreeNode;
 
 // Approximately encapsulates the View Manager service.
 // Has a synchronizer that keeps a client model in sync with the service.
 // Owned by the connection.
 //
 // TODO: displays
 class ViewManager {
  public:
-  // Blocks on establishing the connection and subsequently receiving a node
-  // tree from the service.
-  // TODO(beng): blocking is currently achieved by running a nested runloop,
-  //             which will dispatch all messages on all pipes while blocking.
-  //             we should instead wait on the client pipe receiving a
-  //             connection established message.
-  // TODO(beng): this method could optionally not block if supplied a callback.
-  explicit ViewManager(Application* application);
   ~ViewManager();
 
+  // |ready_callback| is run when the ViewManager connection is established
+  // and ready to use.
+  static void Create(
+      Application* application,
+      const base::Callback<void(ViewManager*)> ready_callback);
+  // Blocks until ViewManager is ready to use.
+  static ViewManager* CreateBlocking(Application* application);
+
   ViewTreeNode* tree() { return tree_; }
 
   ViewTreeNode* GetNodeById(TransportNodeId id);
   View* GetViewById(TransportViewId id);
 
   void Embed(const String& url, ViewTreeNode* node);
 
  private:
   friend class ViewManagerPrivate;
   typedef std::map<TransportNodeId, ViewTreeNode*> IdToNodeMap;
   typedef std::map<TransportViewId, View*> IdToViewMap;
 
+  ViewManager(Application* application,
+              const base::Callback<void(ViewManager*)> ready_callback);
+
+  base::Callback<void(ViewManager*)> ready_callback_;
+
   ViewManagerSynchronizer* synchronizer_;
   ViewTreeNode* tree_;
 
   IdToNodeMap nodes_;
   IdToViewMap views_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManager);
 };
 
 }  // namespace view_manager
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_H_