MockTransportChannel::GetRemoteSSLCertificate: Prepare for base class change

remoting/protocol/channel_socket_adapter_unittest.cc

Index: remoting/protocol/channel_socket_adapter_unittest.cc
diff --git a/remoting/protocol/channel_socket_adapter_unittest.cc b/remoting/protocol/channel_socket_adapter_unittest.cc
index 3ecab7ee5e04420c2d723d57569a4f02091caa0c..bb67eafaf0b4c1771c0cb42fc0cbf2042766d71d 100644
--- a/remoting/protocol/channel_socket_adapter_unittest.cc
+++ b/remoting/protocol/channel_socket_adapter_unittest.cc
@@ -55,6 +55,14 @@ class MockTransportChannel : public cricket::TransportChannel {
                      rtc::scoped_refptr<rtc::RTCCertificate>());
   MOCK_CONST_METHOD1(GetRemoteSSLCertificate,
                      bool(rtc::SSLCertificate** cert));
+
+  // This can't be a real mock method because gmock doesn't support move-only
+  // return values.
+  virtual rtc::scoped_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate() const {

[Sergey Ulanov, 2016/04/05 18:05:23]

I think this should be marked as override instead of virtual, and it won't
compile otherwise.

[kwiberg-chromium, 2016/04/06 08:14:51]

This code must compile both before and after the parent class has a method to
override, and "override" causes a compilation error in the former case, whereas
"virtual" (as you say) causes a compilation error in the latter case.

However, the cause of the error in the latter case isn't something built-in, but
a Chromium-specific warning. And that warning appears to be written specifically
to not apply to classes that use the gmock MOCK_* macros (for a good reason:
those macros predate C++11, and internally use virtual instead of override).

Relying on this is of course horribly ugly. But the second CL---to be landed
after the WebRTC change---replaces "virtual" with "override".

+    EXPECT_TRUE(false);  // Never called.
+    return nullptr;
+  }
+
   MOCK_METHOD6(ExportKeyingMaterial,
                bool(const std::string& label,
                     const uint8_t* context,