Plugin Power Saver: Rebaseline pixel tests.

chrome/browser/plugins/plugin_power_saver_browsertest.cc

 // Copyright 2015 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 <stdint.h>
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/stl_util.h"
@@ skipping 212 matching lines @@
 void CompareSnapshotToReference(const base::FilePath& reference,
                                 bool* snapshot_matches,
                                 const base::Closure& done_cb,
                                 const SkBitmap& bitmap,
                                 content::ReadbackResponse response) {
   DCHECK(snapshot_matches);
   ASSERT_EQ(content::READBACK_SUCCESS, response);
 
   *snapshot_matches = SnapshotMatches(reference, bitmap);
 
-  // When rebaselining the pixel test, the test will fail, and we will
-  // overwrite the reference file. On the next try through, the test will then
-  // pass, since we just overwrote the reference file. A bit wonky.
-  if (!(*snapshot_matches) &&
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
+  // When rebaselining the pixel test, the test may fail. However, the
+  // reference file will still be overwritten.
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kRebaselinePixelTests)) {
     SkBitmap clipped_bitmap;
     bitmap.extractSubset(&clipped_bitmap,
                          SkIRect::MakeWH(kComparisonWidth, kComparisonHeight));
     std::vector<unsigned char> png_data;
     ASSERT_TRUE(
         gfx::PNGCodec::EncodeBGRASkBitmap(clipped_bitmap, false, &png_data));
     ASSERT_EQ(static_cast<int>(png_data.size()),
               base::WriteFile(reference,
                               reinterpret_cast<const char*>(png_data.data()),
@@ skipping 387 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, ZoomIndependent) {
   ui_zoom::ZoomController::FromWebContents(GetActiveWebContents())
       ->SetZoomLevel(4.0);
   LoadHTML(
       "<object id='plugin' data='http://otherorigin.com/fake.swf' "
       "    type='application/x-ppapi-tests' width='400' height='200'>"
       "</object>");
   VerifyPluginIsThrottled(GetActiveWebContents(), "plugin");
 }