Generalizing architecture for screenshot testing

chrome/browser/chromeos/login/screenshot_tester.cc

Index: chrome/browser/chromeos/login/screenshot_tester.cc
diff --git a/chrome/browser/chromeos/login/screenshot_tester.cc b/chrome/browser/chromeos/login/screenshot_tester.cc
index cfc4cf2da83b972eb569186c63ed0727bc8ec1a2..e0bbf7ce177226d9358e276da941439a578fd1da 100644
--- a/chrome/browser/chromeos/login/screenshot_tester.cc
+++ b/chrome/browser/chromeos/login/screenshot_tester.cc
@@ -46,16 +46,6 @@ bool ScreenshotTester::TryInitialize() {
   CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (!command_line.HasSwitch(switches::kEnableScreenshotTestingWithMode))
     return false;
-  if (!command_line.HasSwitch(::switches::kEnablePixelOutputInTests) ||
-      !command_line.HasSwitch(::switches::kUIEnableImplSidePainting)) {
-    // TODO(elizavetai): make turning on --enable-pixel-output-in-tests
-    // and --ui-enable-impl-side-painting automatical.
-    LOG(ERROR) << "--enable-pixel-output-in-tests and "
-               << "--ui-enable-impl-side-painting are required to take "
-               << "screenshots";
-    return false;
-  }
-
   std::string mode = command_line.GetSwitchValueASCII(
       switches::kEnableScreenshotTestingWithMode);
   if (mode != kUpdateMode && mode != kTestMode) {
@@ -121,8 +111,8 @@ bool ScreenshotTester::SaveImage(const std::string& file_name,
     LOG(ERROR) << "Can't save screenshot " << file_name;
     return false;
   }
-  VLOG(0) << "Screenshot " << file_name << ".png saved successfully to "
-          << screenshot_dir.value();
+  VLOG(0) << "Screenshot " << test_name_ + "_" + file_name + ".png"
+          << " saved successfully to " << screenshot_dir.value();
   return true;
 }