Re-enabling WebRTC HD cam tests after Logitech C920 fix.

chrome/browser/media/chrome_webrtc_webcam_browsertest.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 "base/command_line.h"
 #include "chrome/browser/media/webrtc_browsertest_base.h"
 #include "chrome/browser/media/webrtc_browsertest_common.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 14 matching lines @@
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     EXPECT_FALSE(command_line->HasSwitch(
         switches::kUseFakeDeviceForMediaStream));
     EXPECT_FALSE(command_line->HasSwitch(
         switches::kUseFakeUIForMediaStream));
   }
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     DetectErrorsInJavaScript();  // Look for errors in our rather complex js.
   }
+
+ protected:
+  std::string GetUserMediaAndGetStreamSize(content::WebContents* tab,
+                                           const std::string& constraints) {
+    GetUserMediaWithSpecificConstraintsAndAccept(tab, constraints);
+    StartDetectingVideo(tab, "local-view");
+    WaitForVideoToPlay(tab);
+    std::string actual_stream_size = GetStreamSize(tab, "local-view");
+    CloseLastLocalStream(tab);
+    return actual_stream_size;
+  }
 };
 
 IN_PROC_BROWSER_TEST_F(WebRtcWebcamBrowserTest,
                        TestAcquiringAndReacquiringWebcam) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));
   ui_test_utils::NavigateToURL(browser(), url);
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   if (!HasWebcamAvailableOnSystem(tab)) {
     LOG(INFO) << "No webcam found on bot: skipping...";
     return;
   }
 
-  GetUserMediaWithSpecificConstraintsAndAccept(tab,
-                                               kAudioVideoCallConstraintsVGA);
-  StartDetectingVideo(tab, "local-view");
-  WaitForVideoToPlay(tab);
-  EXPECT_EQ("640x480", GetStreamSize(tab, "local-view"));
-  CloseLastLocalStream(tab);
-  GetUserMediaWithSpecificConstraintsAndAccept(tab,
-                                               kAudioVideoCallConstraintsQVGA);
-  StartDetectingVideo(tab, "local-view");
-  WaitForVideoToPlay(tab);
-  EXPECT_EQ("320x240", GetStreamSize(tab, "local-view"));
-  CloseLastLocalStream(tab);
-  GetUserMediaWithSpecificConstraintsAndAccept(tab,
-                                               kAudioVideoCallConstraints360p);
-  StartDetectingVideo(tab, "local-view");
-  WaitForVideoToPlay(tab);
-  EXPECT_EQ("640x360", GetStreamSize(tab, "local-view"));
-  CloseLastLocalStream(tab);
-
-  // Broken on all platforms for C920 webcams: see http://crbug.com/360512.
-//  GetUserMediaWithSpecificConstraintsAndAccept(tab,
-//                                              kAudioVideoCallConstraints720p);
-//  StartDetectingVideo(tab, "local-view");
-//  WaitForVideoToPlay(tab);
-//  EXPECT_EQ("1280x720", GetStreamSize(tab, "local-view"));
-//  CloseLastLocalStream(tab);
-//  GetUserMediaWithSpecificConstraintsAndAccept(tab,
-//                                             kAudioVideoCallConstraints1080p);
-//  StartDetectingVideo(tab, "local-view");
-//  WaitForVideoToPlay(tab);
-//  EXPECT_EQ("1920x1080", GetStreamSize(tab, "local-view"));
-//  CloseLastLocalStream(tab);
+  EXPECT_EQ("640x480",
+            GetUserMediaAndGetStreamSize(tab, kAudioVideoCallConstraintsVGA));
+  EXPECT_EQ("320x240",
+            GetUserMediaAndGetStreamSize(tab, kAudioVideoCallConstraintsQVGA));
+  EXPECT_EQ("640x360",
+            GetUserMediaAndGetStreamSize(tab, kAudioVideoCallConstraints360p));
+  EXPECT_EQ("1280x720",
+            GetUserMediaAndGetStreamSize(tab, kAudioVideoCallConstraints720p));
+  EXPECT_EQ("1920x1080",
+            GetUserMediaAndGetStreamSize(tab, kAudioVideoCallConstraints1080p));
 }