Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / media / chrome_webrtc_browsertest.cc

diff --git a/src/chrome/browser/media/chrome_webrtc_browsertest.cc b/src/chrome/browser/media/chrome_webrtc_browsertest.cc
index ba1cfcd..7ec473c 100644 (file)
--- a/src/chrome/browser/media/chrome_webrtc_browsertest.cc
+++ b/src/chrome/browser/media/chrome_webrtc_browsertest.cc
@@ -24,11 +24,11 @@ static const char kMainWebrtcTestHtmlPage[] =
 // system.
 class WebRtcBrowserTest : public WebRtcTestBase {
  public:
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  void SetUpInProcessBrowserTestFixture() override {
     DetectErrorsInJavaScript();  // Look for errors in our rather complex js.
   }
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  void SetUpCommandLine(CommandLine* command_line) override {
     // Ensure the infobar is enabled, since we expect that in this test.
     EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream));
 
@@ -40,15 +40,8 @@ class WebRtcBrowserTest : public WebRtcTestBase {
   }
 };
 
-#if defined(OS_WIN) || defined(OS_CHROMEOS)
-// http://crbug.com/396505
-#define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs \
-    DISABLED_RunsAudioVideoWebRTCCallInTwoTabs
-#else
-#define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs RunsAudioVideoWebRTCCallInTwoTabs
-#endif
 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
-                       MAYBE_RunsAudioVideoWebRTCCallInTwoTabs) {
+                       RunsAudioVideoWebRTCCallInTwoTabs) {
   if (OnWinXp()) return;
 
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());