Minor cleanup of view manager test

mojo/services/view_manager/view_manager_connection_unittest.cc

 // 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.
 
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 15 matching lines @@
 #include "mojo/shell/shell_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace mojo {
 namespace view_manager {
 namespace service {
 
 namespace {
 
-// TODO(sky): clean this up. Should be moved to the single place its used.
-base::RunLoop* current_run_loop = NULL;
-
 const char kTestServiceURL[] = "mojo:test_url";
 
-void INodesToTestNodes(const Array<INodePtr>& data,
-                       std::vector<TestNode>* test_nodes) {
-  for (size_t i = 0; i < data.size(); ++i) {
-    TestNode node;
-    node.parent_id = data[i]->parent_id;
-    node.node_id = data[i]->node_id;
-    node.view_id = data[i]->view_id;
-    test_nodes->push_back(node);
-  }
-}
-
 // ViewManagerProxy is a proxy to an IViewManager. It handles invoking
 // IViewManager functions on the right thread in a synchronous manner (each
 // IViewManager cover function blocks until the response from the IViewManager
 // is returned). In addition it tracks the set of IViewManagerClient messages
 // received by way of a vector of Changes. Use DoRunLoopUntilChangesCount() to
 // wait for a certain number of messages to be received.
 class ViewManagerProxy : public TestChangeTracker::Delegate {
  public:
   ViewManagerProxy(TestChangeTracker* tracker, base::MessageLoop* loop)
       : tracker_(tracker),
@@ skipping 416 matching lines @@
                               const GURL& url) OVERRIDE {
   }
 
  private:
   base::MessageLoop* initial_loop_;
   ScopedVector<Application> apps_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectServiceLoader);
 };
 
-// Sets |current_run_loop| and runs it. It is expected that someone else quits
-// the loop.
-void DoRunLoop() {
-  DCHECK(!current_run_loop);
-
-  base::RunLoop run_loop;
-  current_run_loop = &run_loop;
-  current_run_loop->Run();
-  current_run_loop = NULL;
-}
-
-// Boolean callback. Sets |result_cache| to the value of |result| and quits
-// the run loop.
-void BooleanCallback(bool* result_cache, bool result) {
-  *result_cache = result;
-  current_run_loop->Quit();
-}
-
 // Creates an id used for transport from the specified parameters.
 TransportNodeId BuildNodeId(TransportConnectionId connection_id,
                             TransportConnectionSpecificNodeId node_id) {
   return (connection_id << 16) | node_id;
 }
 
 // Creates an id used for transport from the specified parameters.
 TransportViewId BuildViewId(TransportConnectionId connection_id,
                             TransportConnectionSpecificViewId view_id) {
   return (connection_id << 16) | view_id;
 }
 
+// Callback from ViewManagerInitConnect(). |result| is the result of the
+// Connect() call and |run_loop| the nested RunLoop.
+void ViewManagerInitConnectCallback(bool* result_cache,
+                                    base::RunLoop* run_loop,
+                                    bool result) {
+  *result_cache = result;
+  run_loop->Quit();
+}
+
 // Resposible for establishing  connection to the viewmanager. Blocks until get
 // back result.
 bool ViewManagerInitConnect(IViewManagerInit* view_manager_init,
                             const std::string& url) {
   bool result = false;
-  view_manager_init->Connect(url, base::Bind(&BooleanCallback, &result));
-  DoRunLoop();
+  base::RunLoop run_loop;
+  view_manager_init->Connect(url,
+                             base::Bind(&ViewManagerInitConnectCallback,
+                                        &result, &run_loop));
+  run_loop.Run();
   return result;
 }
 
 }  // namespace
 
 typedef std::vector<std::string> Changes;
 
 class ViewManagerConnectionTest : public testing::Test {
  public:
   ViewManagerConnectionTest() : connection_(NULL), connection2_(NULL) {}
@@ skipping 812 matching lines @@
 // TODO(sky): add coverage of test that destroys connections and ensures other
 // connections get deletion notification (or advanced server id).
 
 // TODO(sky): need to better track changes to initial connection. For example,
 // that SetBounsdNodes/AddNode and the like don't result in messages to the
 // originating connection.
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo