| Index: chrome/browser/chromeos/login/screenshot_testing/screenshot_tester.cc
|
| diff --git a/chrome/browser/chromeos/login/screenshot_testing/screenshot_tester.cc b/chrome/browser/chromeos/login/screenshot_testing/screenshot_tester.cc
|
| index a1eadf1a522a78d1006820cb639d502808c6e71c..25790203302b9ccbe91b4c06e0bc67b6a678dba1 100644
|
| --- a/chrome/browser/chromeos/login/screenshot_testing/screenshot_tester.cc
|
| +++ b/chrome/browser/chromeos/login/screenshot_testing/screenshot_tester.cc
|
| @@ -59,12 +59,12 @@ bool ScreenshotTester::TryInitialize() {
|
|
|
| std::string mode = command_line.GetSwitchValueASCII(
|
| switches::kEnableScreenshotTestingWithMode);
|
| - CHECK(mode == kUpdateMode || mode == kTestMode || mode == kPdiffTestMode)
|
| - << "Invalid mode for screenshot testing: " << mode;
|
| + // Invalid mode for screenshot testing.
|
| + CHECK(mode == kUpdateMode || mode == kTestMode || mode == kPdiffTestMode);
|
|
|
| - CHECK(command_line.HasSwitch(chromeos::switches::kGoldenScreenshotsDir))
|
| - << "No directory with golden screenshots specified, use "
|
| - "--golden-screenshots-dir";
|
| + // No directory with golden screenshots specified, use
|
| + // --golden-screenshots-dir
|
| + CHECK(command_line.HasSwitch(chromeos::switches::kGoldenScreenshotsDir));
|
|
|
| golden_screenshots_dir_ =
|
| command_line.GetSwitchValuePath(switches::kGoldenScreenshotsDir);
|
| @@ -122,8 +122,8 @@ void ScreenshotTester::Run(const std::string& test_name) {
|
| GetImageFilePath(test_name, kGoldenScreenshot);
|
| PNGFile golden_screenshot = LoadGoldenScreenshot(golden_screenshot_path);
|
| if (test_mode_) {
|
| - CHECK(golden_screenshot.get())
|
| - << "A golden screenshot is required for screenshot testing";
|
| + // A golden screenshot is required for screenshot testing
|
| + CHECK(golden_screenshot.get());
|
| VLOG(0) << "Loaded golden screenshot";
|
| Result result = CompareScreenshots(golden_screenshot, current_screenshot);
|
| VLOG(0) << "Compared";
|
| @@ -237,7 +237,8 @@ ScreenshotTester::PNGFile ScreenshotTester::LoadGoldenScreenshot(
|
| base::GetFileSize(image_path, &golden_screenshot_size);
|
|
|
| if (golden_screenshot_size == -1) {
|
| - CHECK(false) << "Can't get golden screenshot size";
|
| + // Can't get golden screenshot size
|
| + CHECK(false);
|
| }
|
| PNGFile png_data = new base::RefCountedBytes;
|
| png_data->data().resize(golden_screenshot_size);
|
| @@ -330,9 +331,9 @@ ScreenshotTester::Result ScreenshotTester::CompareScreenshotsRegularly(
|
|
|
| testing_result.diff_image = new base::RefCountedBytes;
|
| testing_result.diff_image->data().resize(result.rgbDiffBitmap.getSize());
|
| - CHECK(gfx::PNGCodec::EncodeBGRASkBitmap(
|
| - result.rgbDiffBitmap, false, &testing_result.diff_image->data()))
|
| - << "Could not encode difference to PNG";
|
| + // Could not encode difference to PNG
|
| + CHECK(gfx::PNGCodec::EncodeBGRASkBitmap(result.rgbDiffBitmap, false,
|
| + &testing_result.diff_image->data()));
|
|
|
| return testing_result;
|
| }
|
|
|