diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-10 05:24:35 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-10 05:24:35 +0000 |
| commit | 724861516e6de4a1985121c620b3bd1b357dca25 (patch) | |
| tree | 25cd432873a7a4979d5fa369b959ef1b0bdf58d6 /chrome/browser/policy | |
| parent | cd7ce3be4248527ffb12e6549970e22e8d4005f2 (diff) | |
| download | chromium_src-724861516e6de4a1985121c620b3bd1b357dca25.zip chromium_src-724861516e6de4a1985121c620b3bd1b357dca25.tar.gz chromium_src-724861516e6de4a1985121c620b3bd1b357dca25.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/policy')
| -rw-r--r-- | chrome/browser/policy/policy_browsertest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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."; |