Revert of [devtools] Support different encodings for Page.CaptureScreenshot.

chrome/browser/chromeos/login/screenshot_testing/screenshot_tester.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENSHOT_TESTING_SCREENSHOT_TESTER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENSHOT_TESTING_SCREENSHOT_TESTER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace chromeos {
 
 // A class that allows taking, saving and comparing screnshots while
 // running tests.
 class ScreenshotTester {
  public:
   ScreenshotTester();
   virtual ~ScreenshotTester();
 
-  typedef scoped_refptr<base::RefCountedMemory> PNGFile;
+  typedef scoped_refptr<base::RefCountedBytes> PNGFile;
 
   // Contains the results of comparison
   struct Result {
     Result();
     Result(const Result& other);
     ~Result();
 
     // Is true if screenshots are considered to be equal, false otherwise.
     bool screenshots_match;
 
@@ skipping 61 matching lines @@
   void UpdateGoldenScreenshot(PNGFile png_data);
 
   // Saves an image |png_data|, assuming it is a .png file.
   // Returns true if image was saved successfully.
   bool SaveImage(const base::FilePath& image_path, PNGFile png_data);
 
   // Logs results of comparison accordint to information in |result|.
   void LogComparisonResults(const ScreenshotTester::Result& result);
 
   // Saves |png_data| as a current screenshot.
-  void ReturnScreenshot(PNGFile* screenshot, PNGFile png_data);
+  void ReturnScreenshot(const PNGFile& screenshot, PNGFile png_data);
 
   // Loads golden screenshot from the disk, assuming it lies at |image_path|.
   // Fails if there is no such a file.
   PNGFile LoadGoldenScreenshot(base::FilePath image_path);
 
   // Converts .png file to a bitmap which is ready for comparison (erasing
   // ignored areas included).
   SkBitmap ProcessImageForComparison(const PNGFile& image);
 
   // Calls comparing two given screenshots with one of the comparators.
@@ skipping 11 matching lines @@
                                      SkBitmap sample_bitmap);
 
   // Path to the directory for golden screenshots.
   base::FilePath golden_screenshots_dir_;
 
   // Path to the directory where screenshots that failed comparing
   // and difference between them and golden ones will be stored.
   base::FilePath artifacts_dir_;
 
   // |run_loop_quitter_| is used to stop waiting when
-  // ui::GrabWindowSnapshotAsyncPNG completes.
+  // ui::GrabWindowSnapshotAsync completes.
   base::Closure run_loop_quitter_;
 
   // Is true when we're in test mode:
   // comparing golden screenshots and current ones.
   bool test_mode_;
 
   // Is true when switches specify that PerceptualDiff should
   // be used to compare images.
   bool pdiff_enabled_;
 
   // Is true when switches specify that artifacts should be saved somewhere.
   bool generate_artifacts_;
 
   // Vector which holds areas which the comparison ignores because
   // them being different is not a bug (e.g. time on the clock).
   std::vector<SkIRect> ignored_areas_;
 
   base::WeakPtrFactory<ScreenshotTester> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenshotTester);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENSHOT_TESTING_SCREENSHOT_TESTER_H_