Fixed quality tests after PyAuto test purge.

chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc

 // Copyright 2013 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 "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/strings/string_split.h"
@@ skipping 61 matching lines @@
 static const int k360pWidth = 640;
 static const int k360pHeight = 360;
 
 // If you change the port number, don't forget to modify video_extraction.js
 // too!
 static const char kPyWebSocketPortNumber[] = "12221";
 
 // Test the video quality of the WebRTC output.
 //
 // Prerequisites: This test case must run on a machine with a chrome playing
-// the video from the reference files located int GetReferenceVideosDir().
+// the video from the reference files located in GetReferenceFilesDir().
 // The file kReferenceY4mFileName.kY4mFileExtension is played using a
 // FileVideoCaptureDevice and its sibling with kYuvFileExtension is used for
 // comparison.
 //
 // You must also compile the chromium_builder_webrtc target before you run this
 // test to get all the tools built.
 //
 // The external compare_videos.py script also depends on two external
 // executables which must be located in the PATH when running this test.
 // * zxing (see the CPP version at https://code.google.com/p/zxing)
@@ skipping 13 matching lines @@
         environment_(base::Environment::Create()) {}
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     test::PeerConnectionServerRunner::KillAllPeerConnectionServers();
     DetectErrorsInJavaScript();  // Look for errors in our rather complex js.
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     // Set up the command line option with the expected file name. We will check
     // its existence in HasAllRequiredResources().
-    webrtc_reference_video_y4m_ = test::GetReferenceVideosDir()
+    webrtc_reference_video_y4m_ = test::GetReferenceFilesDir()
         .Append(test::kReferenceFileName360p)
         .AddExtension(test::kY4mFileExtension);
     command_line->AppendSwitchPath(switches::kUseFileForFakeVideoCapture,
                                    webrtc_reference_video_y4m_);
     command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
 
     // The video playback will not work without a GPU, so force its use here.
     command_line->AppendSwitch(switches::kUseGpuInTests);
   }
 
   bool HasAllRequiredResources() {
     if (!base::PathExists(GetWorkingDir())) {
       LOG(ERROR) << "Cannot find the working directory for the temporary "
           "files:" << GetWorkingDir().value();
       return false;
     }
 
     // Ensure we have the required input files.
     return test::HasReferenceFilesInCheckout();
   }
 
   bool StartPyWebSocketServer() {
     base::FilePath path_pywebsocket_dir =
         GetSourceDir().Append(FILE_PATH_LITERAL("third_party/pywebsocket/src"));
     base::FilePath pywebsocket_server = path_pywebsocket_dir.Append(
         FILE_PATH_LITERAL("mod_pywebsocket/standalone.py"));
     base::FilePath path_to_data_handler =
-        GetSourceDir().Append(FILE_PATH_LITERAL("chrome/test/functional"));
+        GetSourceDir().Append(FILE_PATH_LITERAL("chrome/test/data/webrtc/wsh"));
 
     if (!base::PathExists(pywebsocket_server)) {
       LOG(ERROR) << "Missing pywebsocket server.";
       return false;
     }
     if (!base::PathExists(path_to_data_handler)) {
       LOG(ERROR) << "Missing data handler for pywebsocket server.";
       return false;
     }
 
@@ skipping 136 matching lines @@
     base::FilePath browser_dir;
     EXPECT_TRUE(PathService::Get(base::DIR_MODULE, &browser_dir));
     return browser_dir;
   }
 
   base::ProcessHandle pywebsocket_server_;
   scoped_ptr<base::Environment> environment_;
   base::FilePath webrtc_reference_video_y4m_;
 };
 
-// Disabled due to crbug.com/360033.
 IN_PROC_BROWSER_TEST_F(WebRtcVideoQualityBrowserTest,
-                       DISABLED_MANUAL_TestVGAVideoQuality) {
+                       MANUAL_TestVGAVideoQuality) {
 #if defined(OS_WIN)
   // Fails on XP. http://crbug.com/353078
   if (base::win::GetVersion() <= base::win::VERSION_XP)
     return;
 #endif
 
   ASSERT_GE(TestTimeouts::action_max_timeout().InSeconds(), 150) <<
       "This is a long-running test; you must specify "
       "--ui-test-action-max-timeout to have a value of at least 150000.";
 
@@ skipping 37 matching lines @@
 
   chrome::CloseWebContents(browser(), left_tab, false);
   chrome::CloseWebContents(browser(), right_tab, false);
 
   RunARGBtoI420Converter(
       k360pWidth, k360pHeight, GetWorkingDir().Append(kCapturedYuvFileName));
   ASSERT_TRUE(CompareVideosAndPrintResult(
       k360pWidth,
       k360pHeight,
       GetWorkingDir().Append(kCapturedYuvFileName),
-      test::GetReferenceVideosDir()
+      test::GetReferenceFilesDir()
           .Append(test::kReferenceFileName360p)
           .AddExtension(test::kYuvFileExtension),
       GetWorkingDir().Append(kStatsFileName)));
 }