Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Side by Side Diff: trunk/src/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc

Issue 60183003: Revert 230721 "Disable AppRTC test on win until we can figure ou..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/process/launch.h" 7 #include "base/process/launch.h"
8 #include "base/rand_util.h" 8 #include "base/rand_util.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 base::FilePath GetSourceDir() { 112 base::FilePath GetSourceDir() {
113 base::FilePath source_dir; 113 base::FilePath source_dir;
114 PathService::Get(base::DIR_SOURCE_ROOT, &source_dir); 114 PathService::Get(base::DIR_SOURCE_ROOT, &source_dir);
115 return source_dir; 115 return source_dir;
116 } 116 }
117 117
118 private: 118 private:
119 base::ProcessHandle dev_appserver_; 119 base::ProcessHandle dev_appserver_;
120 }; 120 };
121 121
122 #if defined(OS_WIN) 122 IN_PROC_BROWSER_TEST_F(WebrtcApprtcBrowserTest, MANUAL_WorksOnApprtc) {
123 #define MAYBE_MANUAL_WorksOnApprtc DISABLED_MANUAL_WorksOnApprtc
124 #else
125 #define MAYBE_MANUAL_WorksOnApprtc MANUAL_WorksOnApprtc
126 #endif
127
128 IN_PROC_BROWSER_TEST_F(WebrtcApprtcBrowserTest, MAYBE_MANUAL_WorksOnApprtc) {
129 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost()); 123 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost());
130 while (!LocalApprtcInstanceIsUp()) 124 while (!LocalApprtcInstanceIsUp())
131 LOG(INFO) << "Waiting for AppRTC to come up..."; 125 LOG(INFO) << "Waiting for AppRTC to come up...";
132 126
133 GURL room_url = GURL(base::StringPrintf("localhost:9999?r=room_%d", 127 GURL room_url = GURL(base::StringPrintf("localhost:9999?r=room_%d",
134 base::RandInt(0, 65536))); 128 base::RandInt(0, 65536)));
135 129
136 chrome::AddBlankTabAt(browser(), -1, true); 130 chrome::AddBlankTabAt(browser(), -1, true);
137 content::WebContents* left_tab = OpenPageAndAcceptUserMedia(room_url); 131 content::WebContents* left_tab = OpenPageAndAcceptUserMedia(room_url);
138 // TODO(phoglund): Remove when this bug gets fixed: 132 // TODO(phoglund): Remove when this bug gets fixed:
139 // http://code.google.com/p/webrtc/issues/detail?id=1742 133 // http://code.google.com/p/webrtc/issues/detail?id=1742
140 SleepInJavascript(left_tab, 5000); 134 SleepInJavascript(left_tab, 5000);
141 chrome::AddBlankTabAt(browser(), -1, true); 135 chrome::AddBlankTabAt(browser(), -1, true);
142 content::WebContents* right_tab = OpenPageAndAcceptUserMedia(room_url); 136 content::WebContents* right_tab = OpenPageAndAcceptUserMedia(room_url);
143 137
144 ASSERT_TRUE(WaitForCallToComeUp(left_tab)); 138 ASSERT_TRUE(WaitForCallToComeUp(left_tab));
145 ASSERT_TRUE(WaitForCallToComeUp(right_tab)); 139 ASSERT_TRUE(WaitForCallToComeUp(right_tab));
146 140
147 ASSERT_TRUE(StopApprtcInstance()); 141 ASSERT_TRUE(StopApprtcInstance());
148 } 142 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698