Cleanup: avoid foo ? true : false, part 2.

ppapi/tests/test_graphics_2d.cc

 // Copyright (c) 2012 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 "ppapi/tests/test_graphics_2d.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include <set>
@@ skipping 289 matching lines @@
   if (!ReadImageData(dc, &image, pp::Point(0, 0)))
     return "Couldn't read image data";
   if (!IsSquareInImage(image, 0, pp::Rect(0, 0, w, h), 0))
     return "Got a nonzero pixel";
 
   PASS();
 }
 
 std::string TestGraphics2D::TestDescribe() {
   const int w = 15, h = 17;
-  const bool always_opaque = ::rand() % 2 ? true : false;
+  const bool always_opaque = (::rand() % 2 == 1);
   pp::Graphics2D dc(instance_, pp::Size(w, h), always_opaque);
   if (dc.is_null())
     return "Failure creating a boring device";
 
   PP_Size size;
   size.width = -1;
   size.height = -1;
   PP_Bool is_always_opaque = PP_FALSE;
   if (!graphics_2d_interface_->Describe(dc.pp_resource(), &size,
                                         &is_always_opaque))
@@ skipping 323 matching lines @@
       if (rv == PP_OK || rv == PP_OK_COMPLETIONPENDING)
         return "Second flush succeeded before callback ran.";
     }
   }
 
   PASS();
 }
 
 std::string TestGraphics2D::TestDev() {
   // Tests GetScale/SetScale via the Graphics2D_Dev C++ wrapper
-  const int w=20, h=16;
-  const float scale=1.0f/2.0f;
+  const int w = 20, h = 16;
+  const float scale = 1.0f/2.0f;
   pp::Graphics2D dc(instance_, pp::Size(w, h), false);
   if (dc.is_null())
     return "Failure creating a boring device";
   pp::Graphics2D_Dev dc_dev(dc);
   if (dc_dev.GetScale() != 1.0f)
     return "GetScale returned unexpected value before SetScale";
   if (!dc_dev.SetScale(scale))
     return "SetScale failed";
   if (dc_dev.GetScale() != scale)
     return "GetScale mismatch with prior SetScale";
@@ skipping 56 matching lines @@
 
   // Now doing more replace contents should re-use older IDs if the cache is
   // working.
   imageres = ReplaceContentsAndReturnID(&dc, size);
   ASSERT_TRUE(resources.find(imageres) != resources.end());
   imageres = ReplaceContentsAndReturnID(&dc, size);
   ASSERT_TRUE(resources.find(imageres) != resources.end());
 
   PASS();
 }