Fixes viewmanager tests on android

components/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 "components/view_manager/ids.h"
 #include "components/view_manager/public/interfaces/view_manager.mojom.h"
 #include "components/view_manager/public/interfaces/view_manager_root.mojom.h"
@@ skipping 293 matching lines @@
                    const OnWillEmbedCallback& callback) override {
     tracker()->OnWillEmbed(view);
     callback.Run(true, services.Pass(), exposed_services.Pass());
   }
   void OnEmbeddedAppDisconnected(Id view_id) override {
     tracker()->OnEmbeddedAppDisconnected(view_id);
   }
   void OnViewBoundsChanged(Id view_id,
                            RectPtr old_bounds,
                            RectPtr new_bounds) override {
+    // The bounds of the root may change during startup on Android at random

[msw, 2015/06/10 18:42:05]

Should this be in a #if defined(OS_ANDROID)?

[msw, 2015/06/10 19:49:23]

ping

[sky, 2015/06/10 19:54:31]

Sorry, I only responded to one. The same comment applies to that of metrics.

+    // times. As this doesn't matter, and shouldn't impact test exepctations,
+    // it is ignored.
+    if (view_id == ViewIdToTransportId(RootViewId()))
+        return;
     tracker()->OnViewBoundsChanged(view_id, old_bounds.Pass(),
                                    new_bounds.Pass());
   }
   void OnViewViewportMetricsChanged(ViewportMetricsPtr old_metrics,
                                     ViewportMetricsPtr new_metrics) override {
-    tracker()->OnViewViewportMetricsChanged(old_metrics.Pass(),
-                                            new_metrics.Pass());
+    // Don't track the metrics as they are available at an indeterministic time

[msw, 2015/06/10 18:42:05]

Should metrics tracking just be limited to !OS_ANDROID?

[sky, 2015/06/10 19:36:36]

No, since it any case these test don't care. If we do want a test that cares
about metrics tracking I can add a boolean to the tracker indicating this.

+    // on Android.
   }
   void OnViewHierarchyChanged(Id view,
                               Id new_parent,
                               Id old_parent,
                               Array<ViewDataPtr> views) override {
     tracker()->OnViewHierarchyChanged(view, new_parent, old_parent,
                                       views.Pass());
   }
   void OnViewReordered(Id view_id,
                        Id relative_view_id,
@@ skipping 182 matching lines @@
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
 
   // It isn't strictly necessary that the second connection gets 2, but these
   // tests are written assuming that is the case. The key thing is the
   // connection ids of |connection_| and |connection2_| differ.
   ASSERT_EQ(1u, changes2()->size());
   ASSERT_EQ(2, (*changes2())[0].connection_id);
 }
 
 // Verifies when Embed() is invoked any child views are removed.
-// TODO(msw|sky): Fails on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_ViewsRemovedWhenEmbedding DISABLED_ViewsRemovedWhenEmbedding
-#else
-#define MAYBE_ViewsRemovedWhenEmbedding ViewsRemovedWhenEmbedding
-#endif
-TEST_F(ViewManagerServiceAppTest, MAYBE_ViewsRemovedWhenEmbedding) {
+TEST_F(ViewManagerServiceAppTest, ViewsRemovedWhenEmbedding) {
   // Two views 1 and 2. 2 is parented to 1.
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 1)));
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 2)));
   ASSERT_TRUE(AddView(vm1(), BuildViewId(1, 1), BuildViewId(1, 2)));
 
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
   EXPECT_EQ("[view=1,1 parent=null]", ChangeViewDescription(*changes2()));
 
   // Embed() removed view 2.
   {
@@ skipping 36 matching lines @@
   // And view 4 should not be visible to connection 3.
   {
     std::vector<TestView> views;
     GetViewTree(vm3(), BuildViewId(2, 3), &views);
     EXPECT_EQ("view=2,3 parent=null", SingleViewDescription(views));
   }
 }
 
 // Verifies once Embed() has been invoked the parent connection can't see any
 // children.
-// TODO(msw|sky): Fails on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_CantAccessChildrenOfEmbeddedView \
-    DISABLED_CantAccessChildrenOfEmbeddedView
-#else
-#define MAYBE_CantAccessChildrenOfEmbeddedView CantAccessChildrenOfEmbeddedView
-#endif
-TEST_F(ViewManagerServiceAppTest, MAYBE_CantAccessChildrenOfEmbeddedView) {
+TEST_F(ViewManagerServiceAppTest, CantAccessChildrenOfEmbeddedView) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
 
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 2)));
   ASSERT_TRUE(AddView(vm2(), BuildViewId(1, 1), BuildViewId(2, 2)));
 
   ASSERT_NO_FATAL_FAILURE(EstablishThirdConnection(vm2(), BuildViewId(2, 2)));
 
   ASSERT_TRUE(CreateView(vm3(), BuildViewId(3, 3)));
   ASSERT_TRUE(AddView(vm3(), BuildViewId(2, 2), BuildViewId(3, 3)));
 
@@ skipping 17 matching lines @@
     std::vector<TestView> views;
     GetViewTree(vm1(), BuildViewId(1, 1), &views);
     ASSERT_EQ(3u, views.size());
     EXPECT_EQ("view=1,1 parent=null", views[0].ToString());
     EXPECT_EQ("view=2,2 parent=1,1", views[1].ToString());
     EXPECT_EQ("view=3,3 parent=2,2", views[2].ToString());
   }
 }
 
 // Verifies once Embed() has been invoked the parent can't mutate the children.
-// TODO(msw|sky): Fails on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_CantModifyChildrenOfEmbeddedView \
-    DISABLED_CantModifyChildrenOfEmbeddedView
-#else
-#define MAYBE_CantModifyChildrenOfEmbeddedView CantModifyChildrenOfEmbeddedView
-#endif
-TEST_F(ViewManagerServiceAppTest, MAYBE_CantModifyChildrenOfEmbeddedView) {
+TEST_F(ViewManagerServiceAppTest, CantModifyChildrenOfEmbeddedView) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
 
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 2)));
   ASSERT_TRUE(AddView(vm2(), BuildViewId(1, 1), BuildViewId(2, 2)));
 
   ASSERT_NO_FATAL_FAILURE(EstablishThirdConnection(vm2(), BuildViewId(2, 2)));
 
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 3)));
   // Connection 2 shouldn't be able to add anything to the view anymore.
   ASSERT_FALSE(AddView(vm2(), BuildViewId(2, 2), BuildViewId(2, 3)));
 
   // Create view 3 in connection 3 and add it to view 3.
   ASSERT_TRUE(CreateView(vm3(), BuildViewId(3, 3)));
   ASSERT_TRUE(AddView(vm3(), BuildViewId(2, 2), BuildViewId(3, 3)));
 
   // Connection 2 shouldn't be able to remove view 3.
   ASSERT_FALSE(RemoveViewFromParent(vm2(), BuildViewId(3, 3)));
 }
 
 // Verifies client gets a valid id.
-// TODO(msw|sky): Fails on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_CreateView DISABLED_CreateView
-#else
-#define MAYBE_CreateView CreateView
-#endif
-TEST_F(ViewManagerServiceAppTest, MAYBE_CreateView) {
+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,
             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,
             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));
 
   // Make 3 a child of 2.
   ASSERT_TRUE(AddView(vm1(), BuildViewId(1, 2), BuildViewId(1, 3)));
 
   // Try again, this should fail.
   EXPECT_FALSE(AddView(vm1(), BuildViewId(1, 2), BuildViewId(1, 3)));
 }
 
 // Verifies AddView fails when view is already in position.
-// TODO(msw|sky): Fails on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_AddAncestorFails DISABLED_AddAncestorFails
-#else
-#define MAYBE_AddAncestorFails AddAncestorFails
-#endif
-TEST_F(ViewManagerServiceAppTest, MAYBE_AddAncestorFails) {
+TEST_F(ViewManagerServiceAppTest, AddAncestorFails) {
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 2)));
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 3)));
 
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
 
   // Make 3 a child of 2.
   ASSERT_TRUE(AddView(vm1(), BuildViewId(1, 2), BuildViewId(1, 3)));
 
   // Try to make 2 a child of 3, this should fail since 2 is an ancestor of 3.
   EXPECT_FALSE(AddView(vm1(), BuildViewId(1, 3), BuildViewId(1, 2)));
 }
 
 // Verifies adding to root sends right notifications.
-// TODO(msw|sky): Fails on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_AddToRoot DISABLED_AddToRoot
-#else
-#define MAYBE_AddToRoot AddToRoot
-#endif
-TEST_F(ViewManagerServiceAppTest, MAYBE_AddToRoot) {
+TEST_F(ViewManagerServiceAppTest, AddToRoot) {
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 21)));
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 3)));
 
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   changes2()->clear();
 
   // Make 3 a child of 21.
   ASSERT_TRUE(AddView(vm1(), BuildViewId(1, 21), BuildViewId(1, 3)));
 
   // Make 21 a child of 1.
   ASSERT_TRUE(AddView(vm1(), BuildViewId(1, 1), BuildViewId(1, 21)));
 
   // Connection 2 should not be told anything (because the view is from a
   // different connection). Create a view to ensure we got a response from
   // the server.
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 100)));
   EXPECT_TRUE(changes2()->empty());
 }
 
 // Verifies HierarchyChanged is correctly sent for various adds/removes.
-// TODO(msw|sky): Fails on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_ViewHierarchyChangedViews DISABLED_ViewHierarchyChangedViews
-#else
-#define MAYBE_ViewHierarchyChangedViews ViewHierarchyChangedViews
-#endif
-TEST_F(ViewManagerServiceAppTest, MAYBE_ViewHierarchyChangedViews) {
+TEST_F(ViewManagerServiceAppTest, ViewHierarchyChangedViews) {
   // 1,2->1,11.
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 2)));
   ASSERT_TRUE(SetViewVisibility(vm1(), BuildViewId(1, 2), true));
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 11)));
   ASSERT_TRUE(SetViewVisibility(vm1(), BuildViewId(1, 11), true));
   ASSERT_TRUE(AddView(vm1(), BuildViewId(1, 2), BuildViewId(1, 11)));
 
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   ASSERT_TRUE(SetViewVisibility(vm1(), BuildViewId(1, 1), true));
 
@@ skipping 42 matching lines @@
   // 0,1->1,1->1,2->1,11->1,111
   {
     changes2()->clear();
     ASSERT_TRUE(AddView(vm1(), BuildViewId(0, 1), BuildViewId(1, 1)));
     vm_client2_->WaitForChangeCount(1);
     EXPECT_EQ("DrawnStateChanged view=1,1 drawn=true",
               SingleChangeToDescription(*changes2()));
   }
 }
 
-// TODO(msw|sky): Times out on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_ViewHierarchyChangedAddingKnownToUnknown \
-    DISABLED_ViewHierarchyChangedAddingKnownToUnknown
-#else
-#define MAYBE_ViewHierarchyChangedAddingKnownToUnknown \
-    ViewHierarchyChangedAddingKnownToUnknown
-#endif
 TEST_F(ViewManagerServiceAppTest,
-       MAYBE_ViewHierarchyChangedAddingKnownToUnknown) {
+       ViewHierarchyChangedAddingKnownToUnknown) {

[msw, 2015/06/10 18:42:05]

nit: fits on line above

[sky, 2015/06/10 19:36:36]

Done.

   // Create the following structure: root -> 1 -> 11 and 2->21 (2 has no
   // parent).
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
 
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 11)));
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 2)));
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 21)));
 
   // Set up the hierarchy.
   ASSERT_TRUE(AddView(vm1(), BuildViewId(0, 1), BuildViewId(1, 1)));
@@ skipping 80 matching lines @@
 
   // Non-existent view-ids
   EXPECT_FALSE(ReorderView(vm1(), BuildViewId(1, 27), BuildViewId(1, 28),
                            ORDER_DIRECTION_ABOVE));
 
   // view7 & view8 are un-parented.
   EXPECT_FALSE(ReorderView(vm1(), view7_id, view8_id, ORDER_DIRECTION_ABOVE));
 }
 
 // Verifies DeleteView works.
-// TODO(msw|sky): Times out on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_DeleteView DISABLED_DeleteView
-#else
-#define MAYBE_DeleteView DeleteView
-#endif
-TEST_F(ViewManagerServiceAppTest, MAYBE_DeleteView) {
+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();
     ASSERT_TRUE(AddView(vm2(), BuildViewId(1, 1), BuildViewId(2, 2)));
     vm_client1_->WaitForChangeCount(1);
     EXPECT_EQ("HierarchyChanged view=2,2 new_parent=1,1 old_parent=null",
               SingleChangeToDescription(*changes1()));
@@ skipping 12 matching lines @@
 }
 
 // Verifies DeleteView isn't allowed from a separate connection.
 TEST_F(ViewManagerServiceAppTest, DeleteViewFromAnotherConnectionDisallowed) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   EXPECT_FALSE(DeleteView(vm2(), BuildViewId(1, 1)));
 }
 
 // Verifies if a view was deleted and then reused that other clients are
 // properly notified.
-// TODO(msw|sky): Times out on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_ReuseDeletedViewId DISABLED_ReuseDeletedViewId
-#else
-#define MAYBE_ReuseDeletedViewId ReuseDeletedViewId
-#endif
-TEST_F(ViewManagerServiceAppTest, MAYBE_ReuseDeletedViewId) {
+TEST_F(ViewManagerServiceAppTest, ReuseDeletedViewId) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 2)));
 
   // Add 2 to 1.
   {
     changes1()->clear();
     ASSERT_TRUE(AddView(vm2(), BuildViewId(1, 1), BuildViewId(2, 2)));
 
     vm_client1_->WaitForChangeCount(1);
     EXPECT_EQ("HierarchyChanged view=2,2 new_parent=1,1 old_parent=null",
@@ skipping 62 matching lines @@
   }
 
   // Connection 2 shouldn't be able to get the root tree.
   {
     std::vector<TestView> views;
     GetViewTree(vm2(), BuildViewId(0, 1), &views);
     ASSERT_EQ(0u, views.size());
   }
 }
 
-// TODO(msw|sky): Fails on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_SetViewBounds DISABLED_SetViewBounds
-#else
-#define MAYBE_SetViewBounds SetViewBounds
-#endif
-TEST_F(ViewManagerServiceAppTest, MAYBE_SetViewBounds) {
+TEST_F(ViewManagerServiceAppTest, SetViewBounds) {
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 1)));
   ASSERT_TRUE(AddView(vm1(), BuildViewId(0, 1), BuildViewId(1, 1)));
 
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
 
   changes2()->clear();
   ASSERT_TRUE(SetViewBounds(vm1(), BuildViewId(1, 1), 0, 0, 100, 100));
 
   vm_client2_->WaitForChangeCount(1);
   EXPECT_EQ("BoundsChanged view=1,1 old_bounds=0,0 0x0 new_bounds=0,0 100x100",
@@ skipping 98 matching lines @@
   }
 
   // Connection2 has no root. Verify it can't see view 1,1 anymore.
   {
     std::vector<TestView> views;
     GetViewTree(vm2(), BuildViewId(1, 1), &views);
     EXPECT_TRUE(views.empty());
   }
 }
 
-// TODO(msw|sky): Times out on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_EmbedWithSameViewId2 DISABLED_EmbedWithSameViewId2
-#else
-#define MAYBE_EmbedWithSameViewId2 EmbedWithSameViewId2
-#endif
-TEST_F(ViewManagerServiceAppTest, MAYBE_EmbedWithSameViewId2) {
+TEST_F(ViewManagerServiceAppTest, EmbedWithSameViewId2) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   changes2()->clear();
 
   ASSERT_NO_FATAL_FAILURE(EstablishThirdConnection(vm1(), BuildViewId(1, 1)));
 
   // Connection2 should have been told the view was deleted.
   vm_client2_->WaitForChangeCount(1);
   changes2()->clear();
 
   // Create a view in the third connection and parent it to the root.
@@ skipping 107 matching lines @@
     GetViewTree(vm1(), BuildViewId(1, 1), &views);
     ASSERT_EQ(2u, views.size());
     EXPECT_EQ("view=1,1 parent=0,1 visible=true drawn=true",
               views[0].ToString2());
     EXPECT_EQ("view=1,2 parent=1,1 visible=true drawn=true",
               views[1].ToString2());
   }
 }
 
 // Assertions for SetViewVisibility sending notifications.
-// TODO(msw|sky): Fails on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_SetViewVisibilityNotifications \
-    DISABLED_SetViewVisibilityNotifications
-#else
-#define MAYBE_SetViewVisibilityNotifications SetViewVisibilityNotifications
-#endif
-TEST_F(ViewManagerServiceAppTest, MAYBE_SetViewVisibilityNotifications) {
+TEST_F(ViewManagerServiceAppTest, SetViewVisibilityNotifications) {
   // Create 1,1 and 1,2. 1,2 is made a child of 1,1 and 1,1 a child of the root.
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 1)));
   ASSERT_TRUE(SetViewVisibility(vm1(), BuildViewId(1, 1), true));
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 2)));
   ASSERT_TRUE(SetViewVisibility(vm1(), BuildViewId(1, 2), true));
   ASSERT_TRUE(AddView(vm1(), BuildViewId(0, 1), BuildViewId(1, 1)));
   ASSERT_TRUE(AddView(vm1(), BuildViewId(1, 1), BuildViewId(1, 2)));
 
   // Establish the second connection at 1,2.
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnectionWithRoot(BuildViewId(1, 2)));
@@ skipping 61 matching lines @@
   changes2()->clear();
   // Add 1,1 back to the root, connection 2 should see drawn state changed.
   ASSERT_TRUE(AddView(vm1(), BuildViewId(0, 1), BuildViewId(1, 1)));
   {
     vm_client2_->WaitForChangeCount(1);
     EXPECT_EQ("DrawnStateChanged view=1,2 drawn=true",
               SingleChangeToDescription(*changes2()));
   }
 }
 
-// TODO(msw|sky): Fails on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_SetViewProperty DISABLED_SetViewProperty
-#else
-#define MAYBE_SetViewProperty SetViewProperty
-#endif
-TEST_F(ViewManagerServiceAppTest, MAYBE_SetViewProperty) {
+TEST_F(ViewManagerServiceAppTest, SetViewProperty) {
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 1)));
 
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
   changes2()->clear();
 
   ASSERT_TRUE(AddView(vm1(), BuildViewId(0, 1), BuildViewId(1, 1)));
   {
     std::vector<TestView> views;
     GetViewTree(vm1(), BuildViewId(0, 1), &views);
     ASSERT_EQ(2u, views.size());
@@ skipping 24 matching lines @@
   changes2()->clear();
   // Set back to null.
   ASSERT_TRUE(SetViewProperty(vm1(), BuildViewId(1, 1), "one", NULL));
   {
     vm_client2_->WaitForChangeCount(1);
     EXPECT_EQ("PropertyChanged view=1,1 key=one value=NULL",
               SingleChangeToDescription(*changes2()));
   }
 }
 
-// TODO(msw|sky): Fails on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_OnEmbeddedAppDisconnected DISABLED_OnEmbeddedAppDisconnected
-#else
-#define MAYBE_OnEmbeddedAppDisconnected OnEmbeddedAppDisconnected
-#endif
-TEST_F(ViewManagerServiceAppTest, MAYBE_OnEmbeddedAppDisconnected) {
+TEST_F(ViewManagerServiceAppTest, OnEmbeddedAppDisconnected) {
   // Create connection 2 and 3.
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 2)));
   ASSERT_TRUE(AddView(vm2(), BuildViewId(1, 1), BuildViewId(2, 2)));
   changes2()->clear();
   ASSERT_NO_FATAL_FAILURE(EstablishThirdConnection(vm2(), BuildViewId(2, 2)));
 
   // Close connection 3. Connection 2 (which had previously embedded 3) should
   // be notified of this.
   vm_client3_.reset();
   vm_client2_->WaitForChangeCount(1);
   EXPECT_EQ("OnEmbeddedAppDisconnected view=2,2",
             SingleChangeToDescription(*changes2()));
 }
 
 // Verifies when the parent of an Embed() is destroyed the embedded app gets
 // a ViewDeleted (and doesn't trigger a DCHECK).
-// TODO(msw|sky): Fails on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_OnParentOfEmbedDisconnects DISABLED_OnParentOfEmbedDisconnects
-#else
-#define MAYBE_OnParentOfEmbedDisconnects OnParentOfEmbedDisconnects
-#endif
-TEST_F(ViewManagerServiceAppTest, MAYBE_OnParentOfEmbedDisconnects) {
+TEST_F(ViewManagerServiceAppTest, OnParentOfEmbedDisconnects) {
   // Create connection 2 and 3.
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   ASSERT_TRUE(AddView(vm1(), BuildViewId(0, 1), BuildViewId(1, 1)));
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 2)));
   ASSERT_TRUE(AddView(vm2(), BuildViewId(1, 1), BuildViewId(2, 2)));
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 3)));
   ASSERT_TRUE(AddView(vm2(), BuildViewId(2, 2), BuildViewId(2, 3)));
   changes2()->clear();
   ASSERT_NO_FATAL_FAILURE(EstablishThirdConnection(vm2(), BuildViewId(2, 3)));
   changes3()->clear();
 
   // Close connection 2. Connection 3 should get a delete (for its root).
   vm_client2_.reset();
   vm_client3_->WaitForChangeCount(1);
   EXPECT_EQ("ViewDeleted view=2,3", SingleChangeToDescription(*changes3()));
 }
 
 // Verifies ViewManagerServiceImpl doesn't incorrectly erase from its internal
 // map when a view from another connection with the same view_id is removed.
-// TODO(msw|sky): Fails on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_DontCleanMapOnDestroy DISABLED_DontCleanMapOnDestroy
-#else
-#define MAYBE_DontCleanMapOnDestroy DontCleanMapOnDestroy
-#endif
-TEST_F(ViewManagerServiceAppTest, MAYBE_DontCleanMapOnDestroy) {
+TEST_F(ViewManagerServiceAppTest, DontCleanMapOnDestroy) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 1)));
   changes1()->clear();
   vm_client2_.reset();
   vm_client1_->WaitForChangeCount(1);
   EXPECT_EQ("OnEmbeddedAppDisconnected view=1,1",
             SingleChangeToDescription(*changes1()));
   std::vector<TestView> views;
   GetViewTree(vm1(), BuildViewId(1, 1), &views);
   EXPECT_FALSE(views.empty());
 }
 
-// TODO(msw|sky): Fails on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_CloneAndAnimate DISABLED_CloneAndAnimate
-#else
-#define MAYBE_CloneAndAnimate CloneAndAnimate
-#endif
-TEST_F(ViewManagerServiceAppTest, MAYBE_CloneAndAnimate) {
+TEST_F(ViewManagerServiceAppTest, CloneAndAnimate) {
   // Create connection 2 and 3.
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   ASSERT_TRUE(AddView(vm1(), BuildViewId(0, 1), BuildViewId(1, 1)));
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 2)));
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 3)));
   ASSERT_TRUE(AddView(vm2(), BuildViewId(1, 1), BuildViewId(2, 2)));
   ASSERT_TRUE(AddView(vm2(), BuildViewId(2, 2), BuildViewId(2, 3)));
   changes2()->clear();
 
   ASSERT_TRUE(WaitForAllMessages(vm1()));
@@ skipping 25 matching lines @@
 
   ViewManagerClientImpl client2;
   mojo::ViewManagerClientPtr client2_ptr;
   mojo::Binding<ViewManagerClient> client2_binding(&client2, &client2_ptr);
   ASSERT_TRUE(Embed(vm1(), BuildViewId(1, 1), client2_ptr.Pass()));
   client2.WaitForOnEmbed();
   EXPECT_EQ("OnEmbed creator=" + application_impl()->url(),
             SingleChangeToDescription(*client2.tracker()->changes()));
 }
 
-// TODO(msw|sky): Fails on Android; see http://crbug.com/497920
-#if defined(OS_ANDROID)
-#define MAYBE_OnWillEmbed DISABLED_OnWillEmbed
-#else
-#define MAYBE_OnWillEmbed OnWillEmbed
-#endif
-TEST_F(ViewManagerServiceAppTest, MAYBE_OnWillEmbed) {
+TEST_F(ViewManagerServiceAppTest, OnWillEmbed) {
   // Create connections 2 and 3, marking 2 as an embed root.
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   ASSERT_TRUE(AddView(vm1(), BuildViewId(0, 1), BuildViewId(1, 1)));
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 2)));
   ASSERT_TRUE(AddView(vm2(), BuildViewId(1, 1), BuildViewId(2, 2)));
   ASSERT_NO_FATAL_FAILURE(EstablishThirdConnection(vm2(), BuildViewId(2, 2)));
   ASSERT_TRUE(CreateView(vm3(), BuildViewId(3, 3)));
   ASSERT_TRUE(AddView(vm3(), BuildViewId(2, 2), BuildViewId(3, 3)));
   vm2()->SetEmbedRoot();
   // Make sure the viewmanager processed the SetEmbedRoot() call.
@@ skipping 27 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