Revert of Disabling HD video quality tests on win7.

chrome/browser/media/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 <stddef.h>
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file.h"
@@ skipping 21 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/feature_h264_with_openh264_ffmpeg.h"
 #include "content/public/common/features.h"
 #include "content/public/test/browser_test_utils.h"
 #include "media/base/media_switches.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/python_utils.h"
 #include "testing/perf/perf_test.h"
 #include "ui/gl/gl_switches.h"
 
-#if defined(OS_WIN)
-#include "base/win/windows_version.h"
-#endif
-
 namespace {
 std::string MakeLabel(const char* test_name, const std::string& video_codec) {
   std::string codec_label = video_codec.empty() ? "" : "_" + video_codec;
   return base::StringPrintf("%s%s", test_name, codec_label.c_str());
 }
 }  // namespace
 
 static const base::FilePath::CharType kFrameAnalyzerExecutable[] =
 #if defined(OS_WIN)
     FILE_PATH_LITERAL("frame_analyzer.exe");
@@ skipping 221 matching lines @@
     bool has_result_lines = output.find("RESULT") != std::string::npos;
     if (!ok || !has_result_lines) {
       LOG(ERROR) << "Failed to compare videos; see output above to see what "
                  << "the error was.";
       return false;
     }
     return true;
   }
 
   void TestVideoQuality(const std::string& video_codec) {
-#if defined(OS_WIN)
-    // Too slow for bots with bad GL config: see http://crbug.com/613947.
-    bool is_hd = test_config_.width >= 1024;
-    if (is_hd && base::win::GetVersion() == base::win::VERSION_WIN7) {
-      LOG(WARNING) << "Skipping HD test on Win7.";
-      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.";
     ASSERT_TRUE(test::HasReferenceFilesInCheckout());
     ASSERT_TRUE(embedded_test_server()->Start());
 
     content::WebContents* left_tab =
         OpenPageAndGetUserMediaInNewTabWithConstraints(
             embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage),
             test_config_.constraints);
@@ skipping 83 matching lines @@
   if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) {
     LOG(WARNING) << "Run-time feature WebRTC-H264WithOpenH264FFmpeg disabled. "
         "Skipping WebRtcVideoQualityBrowserTest.MANUAL_TestVideoQualityH264 "
         "(test \"OK\")";
     return;
   }
   TestVideoQuality("H264");
 }
 
 #endif  // BUILDFLAG(RTC_USE_H264)