diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 20:44:56 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 20:44:56 +0000 |
| commit | d201e86a4c9608e9d098a506a0da2747a12a8958 (patch) | |
| tree | ddc6704cf1a5340fb3bd886bbce31bbda6c4834c | |
| parent | 95122bcbeb73553790bd842560cfe050fc773634 (diff) | |
| download | chromium_src-d201e86a4c9608e9d098a506a0da2747a12a8958.zip chromium_src-d201e86a4c9608e9d098a506a0da2747a12a8958.tar.gz chromium_src-d201e86a4c9608e9d098a506a0da2747a12a8958.tar.bz2 | |
ASSERT_NO_FATAL_FAILURE -> HasFatalFailure()
Otherwise get build errors on some platforms.
BUG=none
TEST=none
R=ben@chromium.org
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/305783002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273351 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | mojo/services/view_manager/view_manager_connection_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mojo/services/view_manager/view_manager_connection_unittest.cc b/mojo/services/view_manager/view_manager_connection_unittest.cc index aaa78e5..41eeb85 100644 --- a/mojo/services/view_manager/view_manager_connection_unittest.cc +++ b/mojo/services/view_manager/view_manager_connection_unittest.cc @@ -716,7 +716,8 @@ class ViewManagerConnectionTest : public testing::Test { void EstablishBackgroundConnectionWithRoot1() { std::vector<Change> changes( EstablishBackgroundConnectionWithRoots(CreateNodeId(1, 1), 0)); - ASSERT_NO_FATAL_FAILURE(); + if (HasFatalFailure()) + return; ASSERT_EQ(1u, changes.size()); EXPECT_EQ("OnConnectionEstablished", ChangesToDescription1(changes)[0]); EXPECT_EQ("[node=1,1 parent=null view=null]", @@ -1535,7 +1536,8 @@ TEST_F(ViewManagerConnectionTest, SetRoots) { { std::vector<Change> changes(EstablishBackgroundConnectionWithRoots( CreateNodeId(1, 1), CreateNodeId(1, 3))); - ASSERT_NO_FATAL_FAILURE(); + if (HasFatalFailure()) + return; ASSERT_EQ(1u, changes.size()); EXPECT_EQ("OnConnectionEstablished", ChangesToDescription1(changes)[0]); EXPECT_EQ("[node=1,1 parent=null view=null]," |