Keeping golden screenshots in Google Storage

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

 // 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.
 
 #include "chrome/browser/chromeos/login/screenshot_testing/screenshot_tester.h"
 
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "chrome/browser/chromeos/login/screenshot_testing/SkDiffPixelsMetric.h"
@@ skipping 38 matching lines @@
 
 bool ScreenshotTester::TryInitialize() {
   CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (!command_line.HasSwitch(switches::kEnableScreenshotTestingWithMode))
     return false;
 
   std::string mode = command_line.GetSwitchValueASCII(
       switches::kEnableScreenshotTestingWithMode);
   CHECK(mode == kUpdateMode || mode == kTestMode || mode == kPdiffTestMode)
       << "Invalid mode for screenshot testing: " << mode;
+
   CHECK(command_line.HasSwitch(chromeos::switches::kGoldenScreenshotsDir))
-      << "No directory for golden screenshots specified";
+      << "No directory with golden screenshots specified, use "
+         "--golden-screenshots-dir";
 
   golden_screenshots_dir_ =
       command_line.GetSwitchValuePath(switches::kGoldenScreenshotsDir);
 
   if (mode == kTestMode || mode == kPdiffTestMode) {
     test_mode_ = true;
-    if (!command_line.HasSwitch(switches::kArtifactsDir)) {
-      artifacts_dir_ = golden_screenshots_dir_;
-      LOG(WARNING)
-          << "No directory for artifact storing specified. Artifacts will be "
-          << "saved at golden screenshots directory.";
-    } else {
+    generate_artifacts_ = command_line.HasSwitch(switches::kArtifactsDir);
+    if (generate_artifacts_) {
       artifacts_dir_ = command_line.GetSwitchValuePath(switches::kArtifactsDir);
     }
   }
   if (mode == kPdiffTestMode) {
     pdiff_enabled_ = true;
   }
   return true;
 }
 
 std::string ScreenshotTester::GetImageFileName(
@@ skipping 35 matching lines @@
   base::FilePath golden_screenshot_path =
       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";
     VLOG(0) << "Loaded golden screenshot";
     Result result = CompareScreenshots(golden_screenshot, current_screenshot);
     VLOG(0) << "Compared";
     LogComparisonResults(result);
-    if (!result.screenshots_match) {
+    if (!result.screenshots_match && generate_artifacts_) {
       // Saving diff imag
       if (!pdiff_enabled_) {
         base::FilePath difference_image_path =
             GetImageFilePath(test_name, kDifferenceImage);
         CHECK(SaveImage(difference_image_path, result.diff_image));
       }
 
       // Saving failed screenshot
       base::FilePath failed_screenshot_path =
           GetImageFilePath(test_name, kFailedScreenshot);
@@ skipping 206 matching lines @@
 
   ScreenshotTester::Result testing_result;
   testing_result.similarity = result.result;
   testing_result.screenshots_match =
       (result.result == SkImageDiffer::RESULT_CORRECT);
 
   return testing_result;
 }
 
 }  // namespace chromeos