Added DtlsCertificate, a ref counted object owning an SSLIdentity

talk/app/webrtc/proxy.h

 /*
  * libjingle
  * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 63 matching lines @@
   template<typename C, typename M, typename T1, typename T2, typename T3,
       typename T4>
   void Invoke(C* c, M m, T1 a1, T2 a2, T3 a3, T4 a4) {
     r_ = (c->*m)(a1, a2, a3, a4);
   }
   template<typename C, typename M, typename T1, typename T2, typename T3,
      typename T4, typename T5>
   void Invoke(C* c, M m, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5) {
     r_ = (c->*m)(a1, a2, a3, a4, a5);
   }
+  template<typename C, typename M, typename T1, typename T2, typename T3,

[tommi (sloooow) - chröme, 2015/08/18 14:49:35]

do you want to land this change in a separate cl for simplicity?

+     typename T4, typename T5, typename T6>
+  void Invoke(C* c, M m, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6) {
+    r_ = (c->*m)(a1, a2, a3, a4, a5, a6);
+  }
 
   R value() { return r_; }
 
  private:
   R r_;
 };
 
 template <>
 class ReturnType<void> {
  public:
@@ skipping 211 matching lines @@
   C* c_;
   Method m_;
   ReturnType<R> r_;
   T1 a1_;
   T2 a2_;
   T3 a3_;
   T4 a4_;
   T5 a5_;
 };
 
+template <typename C, typename R, typename T1, typename T2, typename T3,
+    typename T4, typename T5, typename T6>
+class MethodCall6 : public rtc::Message,
+                    public rtc::MessageHandler {
+ public:
+  typedef R (C::*Method)(T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6);
+  MethodCall6(C* c, Method m, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6)
+      : c_(c), m_(m), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6) {}
+
+  R Marshal(rtc::Thread* t) {
+    internal::SynchronousMethodCall(this).Invoke(t);
+    return r_.value();
+  }
+
+ private:
+  void OnMessage(rtc::Message*) {
+    r_.Invoke(c_, m_, a1_, a2_, a3_, a4_, a5_, a6_);
+  }
+
+  C* c_;
+  Method m_;
+  ReturnType<R> r_;
+  T1 a1_;
+  T2 a2_;
+  T3 a3_;
+  T4 a4_;
+  T5 a5_;
+  T6 a6_;
+};
+
 #define BEGIN_PROXY_MAP(c)                                                \
   class c##Proxy : public c##Interface {                                  \
    protected:                                                             \
     typedef c##Interface C;                                               \
     c##Proxy(rtc::Thread* thread, C* c) : owner_thread_(thread), c_(c) {} \
     ~c##Proxy() {                                                         \
       MethodCall0<c##Proxy, void> call(this, &c##Proxy::Release_s);       \
       call.Marshal(owner_thread_);                                        \
     }                                                                     \
                                                                           \
@@ skipping 45 matching lines @@
     return call.Marshal(owner_thread_);                                      \
   }
 
 #define PROXY_METHOD5(r, method, t1, t2, t3, t4, t5)                         \
   r method(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5) override {                     \
     MethodCall5<C, r, t1, t2, t3, t4, t5> call(c_.get(), &C::method, a1, a2, \
                                                a3, a4, a5);                  \
     return call.Marshal(owner_thread_);                                      \
   }
 
+#define PROXY_METHOD6(r, method, t1, t2, t3, t4, t5, t6)                     \
+  r method(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6) override {              \
+    MethodCall6<C, r, t1, t2, t3, t4, t5, t6> call(c_.get(), &C::method, a1, \
+                                                   a2, a3, a4, a5, a6);      \
+    return call.Marshal(owner_thread_);                                      \
+  }
+
 #define END_PROXY() \
    private:\
     void Release_s() {\
       c_ = NULL;\
     }\
     mutable rtc::Thread* owner_thread_;\
     rtc::scoped_refptr<C> c_;\
   };\
 
 }  // namespace webrtc
 
 #endif  //  TALK_APP_WEBRTC_PROXY_H_