diff options
author | pkasting <pkasting@chromium.org> | 2015-08-06 18:29:50 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-07 01:30:28 +0000 |
commit | c4afb05f67511e980cd13c021abf26e04b902977 (patch) | |
tree | 125f79c7a354095c4519128b0fe2c9983f644152 /remoting | |
parent | ac97e8e270e8783230272fa07d18d360d2409d5f (diff) | |
download | chromium_src-c4afb05f67511e980cd13c021abf26e04b902977.zip chromium_src-c4afb05f67511e980cd13c021abf26e04b902977.tar.gz chromium_src-c4afb05f67511e980cd13c021abf26e04b902977.tar.bz2 |
Revert of Update SplitString calls to new form (patchset #5 id:80001 of https://codereview.chromium.org/1272823003/ )
Reason for revert:
Caused Blink layout test failures in media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html :
http://test-results.appspot.com/dashboards/flakiness_dashboard.html#showExpectations=true&tests=media%2Fencrypted-media%2Fencrypted-media-requestmediakeysystemaccess.html
Original issue's description:
> Update SplitString calls to new form
>
> Uses the new form for most (but not quite all) of the remaining users of the old form.
>
> Changes media mime util codec list parsing to expect no result from the string "," rather than two empty strings. The old SplitString call had a special case where if the input was empty, it would return empty, but if it had one split character, it would return two empty strings as results.
>
> The new one lets you choose but the options are either (1) empty string -> one empty string and "," -> two empty strings, or (2) map both to no results for when you don't want empty results. I'm pretty sure media codec parsing actually wants the latter behavior, so I updated the call to discard empty results and MimeUtilTest.ParseCodecString is updated.
>
> Committed: https://crrev.com/0aa7c64253cca8b636d52d1d01d94f96ab9c13fa
> Cr-Commit-Position: refs/heads/master@{#342238}
TBR=sky@chromium.org,dalecurtis@chromium.org,brettw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1278973003
Cr-Commit-Position: refs/heads/master@{#342257}
Diffstat (limited to 'remoting')
-rw-r--r-- | remoting/protocol/negotiating_host_authenticator.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/remoting/protocol/negotiating_host_authenticator.cc b/remoting/protocol/negotiating_host_authenticator.cc index c4dada4..37c7a57e5 100644 --- a/remoting/protocol/negotiating_host_authenticator.cc +++ b/remoting/protocol/negotiating_host_authenticator.cc @@ -99,12 +99,12 @@ void NegotiatingHostAuthenticator::ProcessMessage( // Find the first mutually-supported method in the client's list of // supported-methods. - for (const std::string& method_str : - base::SplitString(supported_methods_attr, - std::string(1, kSupportedMethodsSeparator), - base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) { - AuthenticationMethod list_value = - AuthenticationMethod::FromString(method_str); + std::vector<std::string> supported_methods_strs; + base::SplitString(supported_methods_attr, kSupportedMethodsSeparator, + &supported_methods_strs); + for (std::vector<std::string>::iterator it = supported_methods_strs.begin(); + it != supported_methods_strs.end(); ++it) { + AuthenticationMethod list_value = AuthenticationMethod::FromString(*it); if (list_value.is_valid() && std::find(methods_.begin(), methods_.end(), list_value) != methods_.end()) { |