For c++, Generate enum classes instead of enum from mojom.

services/view_manager/view_manager_service_apptest.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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
 #include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
 #include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h"
 #include "mojo/services/window_manager/public/interfaces/window_manager_internal.mojom.h"
 #include "services/view_manager/ids.h"
 #include "services/view_manager/test_change_tracker.h"
 
 using mojo::ApplicationConnection;
 using mojo::ApplicationDelegate;
 using mojo::Array;
 using mojo::Callback;
 using mojo::ConnectionSpecificId;
-using mojo::ERROR_CODE_NONE;
 using mojo::ErrorCode;
 using mojo::EventPtr;
 using mojo::Id;
 using mojo::InterfaceRequest;
-using mojo::ORDER_DIRECTION_ABOVE;
-using mojo::ORDER_DIRECTION_BELOW;
 using mojo::OrderDirection;
 using mojo::RectPtr;
 using mojo::ServiceProvider;
 using mojo::ServiceProviderPtr;
 using mojo::String;
 using mojo::ViewDataPtr;
 using mojo::ViewManagerClient;
 using mojo::ViewManagerService;
 using mojo::ViewportMetricsPtr;
 
@@ skipping 26 matching lines @@
                             Array<ViewDataPtr> results) {
   ViewDatasToTestViews(results, views);
   run_loop->Quit();
 }
 
 // -----------------------------------------------------------------------------
 
 // The following functions call through to the supplied ViewManagerService. They
 // block until call completes and return the result.
 bool CreateView(ViewManagerService* vm, Id view_id) {
-  ErrorCode result = ERROR_CODE_NONE;
+  ErrorCode result = ErrorCode::NONE;
   base::RunLoop run_loop;
   vm->CreateView(view_id,
                  base::Bind(&ErrorCodeResultCallback, &run_loop, &result));
   run_loop.Run();
-  return result == ERROR_CODE_NONE;
+  return result == ErrorCode::NONE;
 }
 
 bool EmbedUrl(ViewManagerService* vm, const String& url, Id root_id) {
   bool result = false;
   base::RunLoop run_loop;
   {
     vm->EmbedUrl(url, root_id, nullptr, nullptr,
                  base::Bind(&BoolResultCallback, &run_loop, &result));
   }
   run_loop.Run();
   return result;
 }
 
 bool Embed(ViewManagerService* vm,
            Id root_id,
            mojo::ViewManagerClientPtr client) {
   bool result = false;
   base::RunLoop run_loop;
   {
     vm->Embed(root_id, client.Pass(),
               base::Bind(&BoolResultCallback, &run_loop, &result));
   }
   run_loop.Run();
   return result;
 }
 
 ErrorCode CreateViewWithErrorCode(ViewManagerService* vm, Id view_id) {
-  ErrorCode result = ERROR_CODE_NONE;
+  ErrorCode result = ErrorCode::NONE;
   base::RunLoop run_loop;
   vm->CreateView(view_id,
                  base::Bind(&ErrorCodeResultCallback, &run_loop, &result));
   run_loop.Run();
   return result;
 }
 
 bool AddView(ViewManagerService* vm, Id parent, Id child) {
   bool result = false;
   base::RunLoop run_loop;
@@ skipping 83 matching lines @@
   run_loop.Run();
   return result;
 }
 
 // Utility functions -----------------------------------------------------------
 
 // Waits for all messages to be received by |vm|. This is done by attempting to
 // create a bogus view. When we get the response we know all messages have been
 // processed.
 bool WaitForAllMessages(ViewManagerService* vm) {
-  ErrorCode result = ERROR_CODE_NONE;
+  ErrorCode result = ErrorCode::NONE;
   base::RunLoop run_loop;
   vm->CreateView(ViewIdToTransportId(InvalidViewId()),
                  base::Bind(&ErrorCodeResultCallback, &run_loop, &result));
   run_loop.Run();
-  return result != ERROR_CODE_NONE;
+  return result != ErrorCode::NONE;
 }
 
 bool HasClonedView(const std::vector<TestView>& views) {
   for (size_t i = 0; i < views.size(); ++i)
     if (views[i].view_id == ViewIdToTransportId(ClonedViewId()))
       return true;
   return false;
 }
 
 // -----------------------------------------------------------------------------
@@ skipping 425 matching lines @@
   // Connection 2 shouldn't be able to remove view 3.
   ASSERT_FALSE(RemoveViewFromParent(vm2(), BuildViewId(3, 3)));
 }
 
 // Verifies client gets a valid id.
 TEST_F(ViewManagerServiceAppTest, CreateView) {
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 1)));
   EXPECT_TRUE(changes1()->empty());
 
   // Can't create a view with the same id.
-  ASSERT_EQ(mojo::ERROR_CODE_VALUE_IN_USE,
+  ASSERT_EQ(mojo::ErrorCode::VALUE_IN_USE,
             CreateViewWithErrorCode(vm1(), BuildViewId(1, 1)));
   EXPECT_TRUE(changes1()->empty());
 
   // Can't create a view with a bogus connection id.
-  EXPECT_EQ(mojo::ERROR_CODE_ILLEGAL_ARGUMENT,
+  EXPECT_EQ(mojo::ErrorCode::ILLEGAL_ARGUMENT,
             CreateViewWithErrorCode(vm1(), BuildViewId(2, 1)));
   EXPECT_TRUE(changes1()->empty());
 }
 
 // Verifies AddView fails when view is already in position.
 TEST_F(ViewManagerServiceAppTest, AddViewWithNoChange) {
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 2)));
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 3)));
 
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
@@ skipping 164 matching lines @@
   ASSERT_TRUE(CreateView(vm2(), view8_id));
   ASSERT_TRUE(AddView(vm2(), view1_id, view2_id));
   ASSERT_TRUE(AddView(vm2(), view2_id, view6_id));
   ASSERT_TRUE(AddView(vm2(), view1_id, view3_id));
   ASSERT_TRUE(AddView(vm1(), ViewIdToTransportId(RootViewId()), view4_id));
   ASSERT_TRUE(AddView(vm1(), ViewIdToTransportId(RootViewId()), view5_id));
   ASSERT_TRUE(AddView(vm1(), ViewIdToTransportId(RootViewId()), view1_id));
 
   {
     changes1()->clear();
-    ASSERT_TRUE(ReorderView(vm2(), view2_id, view3_id, ORDER_DIRECTION_ABOVE));
+    ASSERT_TRUE(ReorderView(vm2(), view2_id, view3_id, OrderDirection::ABOVE));
 
     vm_client1_.WaitForChangeCount(1);
     EXPECT_EQ("Reordered view=2,2 relative=2,3 direction=above",
               SingleChangeToDescription(*changes1()));
   }
 
   {
     changes1()->clear();
-    ASSERT_TRUE(ReorderView(vm2(), view2_id, view3_id, ORDER_DIRECTION_BELOW));
+    ASSERT_TRUE(ReorderView(vm2(), view2_id, view3_id, OrderDirection::BELOW));
 
     vm_client1_.WaitForChangeCount(1);
     EXPECT_EQ("Reordered view=2,2 relative=2,3 direction=below",
               SingleChangeToDescription(*changes1()));
   }
 
   // view2 is already below view3.
-  EXPECT_FALSE(ReorderView(vm2(), view2_id, view3_id, ORDER_DIRECTION_BELOW));
+  EXPECT_FALSE(ReorderView(vm2(), view2_id, view3_id, OrderDirection::BELOW));
 
   // view4 & 5 are unknown to connection2_.
-  EXPECT_FALSE(ReorderView(vm2(), view4_id, view5_id, ORDER_DIRECTION_ABOVE));
+  EXPECT_FALSE(ReorderView(vm2(), view4_id, view5_id, OrderDirection::ABOVE));
 
   // view6 & view3 have different parents.
-  EXPECT_FALSE(ReorderView(vm1(), view3_id, view6_id, ORDER_DIRECTION_ABOVE));
+  EXPECT_FALSE(ReorderView(vm1(), view3_id, view6_id, OrderDirection::ABOVE));
 
   // Non-existent view-ids
   EXPECT_FALSE(ReorderView(vm1(), BuildViewId(1, 27), BuildViewId(1, 28),
-                           ORDER_DIRECTION_ABOVE));
+                           OrderDirection::ABOVE));
 
   // view7 & view8 are un-parented.
-  EXPECT_FALSE(ReorderView(vm1(), view7_id, view8_id, ORDER_DIRECTION_ABOVE));
+  EXPECT_FALSE(ReorderView(vm1(), view7_id, view8_id, OrderDirection::ABOVE));
 }
 
 // Verifies DeleteView works.
 TEST_F(ViewManagerServiceAppTest, DeleteView) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 2)));
 
   // Make 2 a child of 1.
   {
     changes1()->clear();
@@ skipping 596 matching lines @@
 // TODO(sky): need to better track changes to initial connection. For example,
 // that SetBounsdViews/AddView and the like don't result in messages to the
 // originating connection.
 
 // TODO(sky): make sure coverage of what was
 // ViewManagerTest.SecondEmbedRoot_InitService and
 // ViewManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window manager
 // tests.
 
 }  // namespace view_manager