Split regular and perf WebRTC browser tests, remove CPU test.

chrome/browser/media/chrome_webrtc_disable_encryption_flag_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 "base/win/windows_version.h"
 #include "chrome/browser/media/webrtc_browsertest_base.h"
 #include "chrome/browser/media/webrtc_browsertest_common.h"
 #include "chrome/common/chrome_version_info.h"
 #include "content/public/common/content_switches.h"
 #include "media/base/media_switches.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 static const char kMainWebrtcTestHtmlPage[] =
     "/webrtc/webrtc_jsep01_test.html";
 
@@ skipping 27 matching lines @@
     command_line->AppendSwitch(switches::kDisableWebRtcEncryption);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebRtcDisableEncryptionFlagBrowserTest);
 };
 
 // Makes a call and checks that there's encryption or not in the SDP offer.
 IN_PROC_BROWSER_TEST_F(WebRtcDisableEncryptionFlagBrowserTest,
                        VerifyEncryption) {
-// Flaky timeout on a webrtc Win XP bot. http://crbug.com/368163.
-#if defined (OS_WIN)
-  if (base::win::GetVersion() < base::win::VERSION_VISTA)
-    return;
-#endif
+  if (!OnWinXp())
+    return;  // Flaky timeout on a webrtc Win XP bot. http://crbug.com/368163.
 
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   content::WebContents* left_tab =
       OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage);
   content::WebContents* right_tab =
       OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage);
 
   SetupPeerconnectionWithLocalStream(left_tab);
   SetupPeerconnectionWithLocalStream(right_tab);
@@ skipping 18 matching lines @@
     should_detect_encryption = false;
 #endif
 
   std::string expected_string = should_detect_encryption ?
     "crypto-seen" : "no-crypto-seen";
 
   ASSERT_EQ(expected_string,
             ExecuteJavascript("hasSeenCryptoInSdp()", left_tab));
 
   HangUp(left_tab);
+  HangUp(right_tab);
 }