Make reftests work for sky.

sky/tools/tester/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 <iostream>
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
 #include "mojo/services/view_manager/public/cpp/view_manager.h"
 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
 #include "mojo/services/view_manager/public/cpp/view_observer.h"
 #include "services/window_manager/window_manager_app.h"
 #include "services/window_manager/window_manager_delegate.h"
 #include "sky/tools/tester/test_runner.h"
 
 namespace sky {
 namespace tester {
 namespace {
 
-std::string WaitForURL() {
-  std::string url;
-  std::cin >> url;
-  return url;
+std::string WaitForURL(bool* enable_pixel_dumping,

[esprehn, 2014/12/11 23:18:59]

Maybe return a struct of results? Having so many out params is a little weird.

[ojan, 2014/12/13 00:18:33]

Done. I made it an out param.

+                       std::string* expected_pixel_hash) {
+  // A test name is formated like file:///path/to/test'--pixel-test'pixelhash
+  std::string test_name;
+  std::cin >> test_name;
+
+  std::string pixel_switch;
+  std::string::size_type separator_position = test_name.find('\'');
+  if (separator_position != std::string::npos) {
+    pixel_switch = test_name.substr(separator_position + 1);
+    test_name.erase(separator_position);
+  }
+
+  std::string pixel_hash;
+  separator_position = pixel_switch.find('\'');
+  if (separator_position != std::string::npos) {
+    pixel_hash = pixel_switch.substr(separator_position + 1);
+    pixel_switch.erase(separator_position);
+  }
+
+  if (enable_pixel_dumping)
+    *enable_pixel_dumping = pixel_switch == "--pixel-test";
+  if (expected_pixel_hash)
+    *expected_pixel_hash = pixel_hash;
+
+  return test_name;
 }
 
 }  // namespace
 
 class SkyTester : public mojo::ApplicationDelegate,
                   public mojo::ViewManagerDelegate,
                   public window_manager::WindowManagerDelegate,
                   public mojo::ViewObserver,
                   public TestRunnerClient {
  public:
@@ skipping 63 matching lines @@
     content_->SetBounds(new_bounds);
   }
 
   void ScheduleRun() {
     base::MessageLoop::current()->PostTask(FROM_HERE,
         base::Bind(&SkyTester::Run, weak_ptr_factory_.GetWeakPtr()));
   }
 
   void Run() {
     DCHECK(!test_runner_);
-    std::string url = url_from_args_.length() ? url_from_args_ : WaitForURL();
-    test_runner_.reset(new TestRunner(this, content_, url));
+
+    bool enable_pixel_dumping = false;
+    std::string expected_pixel_hash;
+
+    std::string url = url_from_args_.length() ? url_from_args_ : WaitForURL(&enable_pixel_dumping, &expected_pixel_hash);
+    test_runner_.reset(new TestRunner(this, content_, url, enable_pixel_dumping));
   }
 
   void OnTestComplete() override {
     test_runner_.reset();
     if (url_from_args_.length())
       exit(0);
     ScheduleRun();
   }
 
   void DispatchInputEvent(mojo::EventPtr event) override {
@@ skipping 15 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SkyTester);
 };
 
 }  // namespace tester
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new sky::tester::SkyTester);
   return runner.Run(shell_handle);
 }