services/view_manager/view_manager_service_unittest.cc - Issue 1375313006: For c++, Generate enum classes instead of enum from mojom.

Unified Diff: services/view_manager/view_manager_service_unittest.cc

Issue 1375313006: For c++, Generate enum classes instead of enum from mojom. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« services/view_manager/view_manager_service_apptest.cc ('K') | « services/view_manager/view_manager_service_impl.cc ('k') | shell/application_manager/network_fetcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: services/view_manager/view_manager_service_unittest.cc

diff --git a/services/view_manager/view_manager_service_unittest.cc b/services/view_manager/view_manager_service_unittest.cc

index 72d957a2fc250b21ce57585a8d4c0a1ed1883559..7cc5975543c9c258f0fb3347f6f7747b15ebde17 100644

--- a/services/view_manager/view_manager_service_unittest.cc

+++ b/services/view_manager/view_manager_service_unittest.cc

@@ -25,7 +25,7 @@

#include "ui/gfx/geometry/rect.h"

using mojo::Array;

-using mojo::ERROR_CODE_NONE;

+using mojo::ErrorCode;

using mojo::InterfaceRequest;

using mojo::ServiceProvider;

using mojo::ServiceProviderPtr;

@@ -288,7 +288,7 @@ const ServerView* GetFirstCloned(const ServerView* view) {

// CloneAndAnimate() is invoked for 2,2.

void SetUpAnimate1(ViewManagerServiceTest* test, ViewId* embed_view_id) {

*embed_view_id = ViewId(test->wm_connection()->id(), 1);

- EXPECT_EQ(ERROR_CODE_NONE, test->wm_connection()->CreateView(*embed_view_id));

+ EXPECT_EQ(ErrorCode::NONE, test->wm_connection()->CreateView(*embed_view_id));

EXPECT_TRUE(test->wm_connection()->SetViewVisibility(*embed_view_id, true));

EXPECT_TRUE(test->wm_connection()->AddView(*(test->wm_connection()->root()),

*embed_view_id));

@@ -300,11 +300,11 @@ void SetUpAnimate1(ViewManagerServiceTest* test, ViewId* embed_view_id) {

ASSERT_NE(connection1, test->wm_connection());

const ViewId child1(connection1->id(), 1);

- EXPECT_EQ(ERROR_CODE_NONE, connection1->CreateView(child1));

+ EXPECT_EQ(ErrorCode::NONE, connection1->CreateView(child1));

const ViewId child2(connection1->id(), 2);

- EXPECT_EQ(ERROR_CODE_NONE, connection1->CreateView(child2));

+ EXPECT_EQ(ErrorCode::NONE, connection1->CreateView(child2));

const ViewId child3(connection1->id(), 3);

- EXPECT_EQ(ERROR_CODE_NONE, connection1->CreateView(child3));

+ EXPECT_EQ(ErrorCode::NONE, connection1->CreateView(child3));

ServerView* v1 = connection1->GetView(child1);

v1->SetVisible(true);

@@ -425,7 +425,7 @@ TEST_F(ViewManagerServiceTest, ClonedViewsPromotedOnHide) {

// SetUpAnimate1() but cloning 2,1.

TEST_F(ViewManagerServiceTest, CloneAndAnimateLargerDepth) {

const ViewId embed_view_id(wm_connection()->id(), 1);

- EXPECT_EQ(ERROR_CODE_NONE, wm_connection()->CreateView(embed_view_id));

+ EXPECT_EQ(ErrorCode::NONE, wm_connection()->CreateView(embed_view_id));

EXPECT_TRUE(wm_connection()->SetViewVisibility(embed_view_id, true));

EXPECT_TRUE(

wm_connection()->AddView(*(wm_connection()->root()), embed_view_id));

@@ -436,11 +436,11 @@ TEST_F(ViewManagerServiceTest, CloneAndAnimateLargerDepth) {

ASSERT_NE(connection1, wm_connection());