Add IsAcceptableCipher, use instead of GetDefaultCipher.

webrtc/base/opensslstreamadapter.h

Index: webrtc/base/opensslstreamadapter.h
diff --git a/webrtc/base/opensslstreamadapter.h b/webrtc/base/opensslstreamadapter.h
index e57b2a3293d5942ae15226a778ed39907f965db8..3157b5266f27788260e1d06a6fa85454dfac9eec 100644
--- a/webrtc/base/opensslstreamadapter.h
+++ b/webrtc/base/opensslstreamadapter.h
@@ -92,6 +92,8 @@ class OpenSSLStreamAdapter : public SSLStreamAdapter {
 
   bool GetSslCipherSuite(int* cipher) override;
 
+  int GetSslVersion() const override;
+
   // Key Extractor interface
   bool ExportKeyingMaterial(const std::string& label,
                             const uint8_t* context,
@@ -109,9 +111,8 @@ class OpenSSLStreamAdapter : public SSLStreamAdapter {
   static bool HaveDtlsSrtp();
   static bool HaveExporter();
 
-  // TODO(guoweis): Move this away from a static class method.
-  static int GetDefaultSslCipherForTest(SSLProtocolVersion version,
-                                        KeyType key_type);
+  static bool IsAcceptableCipher(int cipher, KeyType key_type);
+  static bool IsAcceptableCipher(std::string cipher, KeyType key_type);

[tommi, 2016/03/10 21:37:59]

const &

[torbjorng (webrtc), 2016/03/11 07:50:18]

Done.

 
  protected:
   void OnEvent(StreamInterface* stream, int events, int err) override;