Index: chrome/browser/media/webrtc/webrtc_browsertest_base.cc |
diff --git a/chrome/browser/media/webrtc/webrtc_browsertest_base.cc b/chrome/browser/media/webrtc/webrtc_browsertest_base.cc |
index 107b49f612b8ff72ad093d6ca6a5dc834688434b..f388b3b20a12718b9fc98582d5f307965725e88c 100644 |
--- a/chrome/browser/media/webrtc/webrtc_browsertest_base.cc |
+++ b/chrome/browser/media/webrtc/webrtc_browsertest_base.cc |
@@ -120,6 +120,18 @@ class PermissionRequestObserver : public PermissionRequestManager::Observer { |
DISALLOW_COPY_AND_ASSIGN(PermissionRequestObserver); |
}; |
+std::vector<std::string> SemicolonListToVector( |
+ const std::string str, size_t start_index = 0) { |
+ std::vector<std::string> vector; |
+ for (size_t begin = start_index, end = begin; begin <= str.length(); ++end) { |
+ if (end >= str.length() || str[end] == ';') { |
+ vector.push_back(str.substr(begin, end - begin)); |
+ begin = end + 1; |
+ } |
+ } |
+ return vector; |
+} |
+ |
} // namespace |
WebRtcTestBase::WebRtcTestBase(): detect_errors_in_javascript_(false) { |
@@ -460,10 +472,17 @@ void WebRtcTestBase::VerifyStatsGeneratedCallback( |
EXPECT_EQ("ok-got-stats", ExecuteJavascript("verifyStatsGenerated()", tab)); |
} |
-void WebRtcTestBase::VerifyStatsGeneratedPromise( |
+std::vector<std::string> WebRtcTestBase::VerifyStatsGeneratedPromise( |
+ content::WebContents* tab) const { |
+ std::string result = ExecuteJavascript("verifyStatsGeneratedPromise()", tab); |
+ EXPECT_TRUE(base::StartsWith(result, "ok-", base::CompareCase::SENSITIVE)); |
+ return SemicolonListToVector(result, 3); |
+} |
+ |
+std::vector<std::string> WebRtcTestBase::GetWhitelistedStatsTypes( |
content::WebContents* tab) const { |
- EXPECT_EQ("ok-got-stats", |
- ExecuteJavascript("verifyStatsGeneratedPromise()", tab)); |
+ return SemicolonListToVector( |
+ ExecuteJavascript("getWhitelistedStatsTypes()", tab)); |
} |
void WebRtcTestBase::SetDefaultVideoCodec( |