From 724861516e6de4a1985121c620b3bd1b357dca25 Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Mon, 10 Sep 2012 05:24:35 +0000 Subject: Fix official bots after r155650 As documented at http://code.google.com/p/googletest/wiki/AdvancedGuide#Propagating_Fatal_Failures , ASSERT_ is mostly a glorified "return;" and hence can't be used in functions not returning void. Fix. BUG=none TBR=joaodasilva Review URL: https://chromiumcodereview.appspot.com/10905176 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155668 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/policy/policy_browsertest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/browser/policy') diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 42d4366..867aa0b 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -235,7 +235,7 @@ const webkit::WebPluginInfo* GetFlashPlugin( } #if defined(OFFICIAL_BUILD) // Official builds bundle Flash. - ASSERT_TRUE(flash); + EXPECT_TRUE(flash); #else if (!flash) LOG(INFO) << "Test skipped because the Flash plugin couldn't be found."; -- cgit v1.1