Start of adding enums for error codes

mojo/services/view_manager/view_manager_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/at_exit.h"
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 75 matching lines @@
 
   // Destroys the connection, blocking until done.
   void Destroy() {
     router_->CloseMessagePipe();
   }
 
   // The following functions are cover methods for ViewManagerService. They
   // block until the result is received.
   bool CreateNode(Id node_id) {
     changes_.clear();
-    bool result = false;
-    view_manager_->CreateNode(node_id,
-                              base::Bind(&ViewManagerProxy::GotResult,
-                                         base::Unretained(this), &result));
+    ErrorCode result = ERROR_CODE_NONE;
+    view_manager_->CreateNode(
+        node_id,
+        base::Bind(&ViewManagerProxy::GotResultWithErrorCode,
+                   base::Unretained(this), &result));
+    RunMainLoop();
+    return result == ERROR_CODE_NONE;
+  }
+  ErrorCode CreateNodeWithErrorCode(Id node_id) {
+    changes_.clear();
+    ErrorCode result = ERROR_CODE_NONE;
+    view_manager_->CreateNode(
+        node_id,
+        base::Bind(&ViewManagerProxy::GotResultWithErrorCode,
+                   base::Unretained(this), &result));
     RunMainLoop();
     return result;
   }
   bool AddNode(Id parent, Id child, Id server_change_id) {
     changes_.clear();
     bool result = false;
     view_manager_->AddNode(parent, child, server_change_id,
                            base::Bind(&ViewManagerProxy::GotResult,
                                       base::Unretained(this), &result));
     RunMainLoop();
@@ skipping 124 matching lines @@
       main_run_loop_->Quit();
   }
 
   // Callbacks from the various ViewManagerService functions.
   void GotResult(bool* result_cache, bool result) {
     *result_cache = result;
     DCHECK(main_run_loop_);
     main_run_loop_->Quit();
   }
 
+  void GotResultWithErrorCode(ErrorCode* error_code_cache,
+                              ErrorCode error_code) {
+    *error_code_cache = error_code;
+    DCHECK(main_run_loop_);
+    main_run_loop_->Quit();
+  }
+
   void GotNodeTree(std::vector<TestNode>* nodes, Array<NodeDataPtr> results) {
     NodeDatasToTestNodes(results, nodes);
     DCHECK(main_run_loop_);
     main_run_loop_->Quit();
   }
 
   // TestChangeTracker::Delegate:
   virtual void OnChangeAdded() OVERRIDE {
     if (quit_count_ > 0 && --quit_count_ == 0)
       QuitCountReached();
@@ skipping 280 matching lines @@
   // Change ids start at 1 as well.
   EXPECT_EQ(static_cast<Id>(1), connection2_->changes()[0].change_id);
 }
 
 // Verifies client gets a valid id.
 TEST_F(ViewManagerTest, CreateNode) {
   ASSERT_TRUE(connection_->CreateNode(BuildNodeId(1, 1)));
   EXPECT_TRUE(connection_->changes().empty());
 
   // Can't create a node with the same id.
-  ASSERT_FALSE(connection_->CreateNode(BuildNodeId(1, 1)));
+  ASSERT_EQ(ERROR_CODE_VALUE_IN_USE,
+            connection_->CreateNodeWithErrorCode(BuildNodeId(1, 1)));
   EXPECT_TRUE(connection_->changes().empty());
 
   // Can't create a node with a bogus connection id.
-  EXPECT_FALSE(connection_->CreateNode(BuildNodeId(2, 1)));
+  EXPECT_EQ(
+      ERROR_CODE_ILLEGAL_ARGUMENT,
+      connection_->CreateNodeWithErrorCode(BuildNodeId(2, 1)));
   EXPECT_TRUE(connection_->changes().empty());
 }
 
 TEST_F(ViewManagerTest, CreateViewFailsWithBogusConnectionId) {
   EXPECT_FALSE(connection_->CreateView(BuildViewId(2, 1)));
   EXPECT_TRUE(connection_->changes().empty());
 }
 
 // Verifies hierarchy changes.
 TEST_F(ViewManagerTest, AddRemoveNotify) {
@@ skipping 817 matching lines @@
 // originating connection.
 
 // TODO(beng): Add tests for focus:
 // - focus between two nodes known to a connection
 // - focus between nodes unknown to one of the connections.
 // - focus between nodes unknown to either connection.
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo