Webrtc deps roll.

remoting/client/plugin/chromoting_instance.cc

Index: remoting/client/plugin/chromoting_instance.cc
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 2e40117c907e05be2eee675a680692749c294274..7e76fc19b2e00d4945cba1c18660ffafbb629b6d 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -9,8 +9,8 @@
 #include <vector>
 
 #if defined(OS_NACL)
-#include <sys/mount.h>
 #include <nacl_io/nacl_io.h>

[Wez, 2014/07/31 21:22:53]

Did you mean to move this? Does the Chromoting PNaCl client build with the order
reversed?

[hellner1, 2014/07/31 21:36:27]

I ran http://src.chromium.org/viewvc/chrome/trunk/src/tools/sort-headers.py to
fix the header order of the files I touched.

+#include <sys/mount.h>
 #endif
 
 #include "base/bind.h"
@@ -52,8 +52,8 @@
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/libjingle_transport_factory.h"
-#include "third_party/libjingle/source/talk/base/helpers.h"
-#include "third_party/libjingle/source/talk/base/ssladapter.h"
+#include "third_party/webrtc/base/helpers.h"
+#include "third_party/webrtc/base/ssladapter.h"
 #include "url/gurl.h"
 
 // Windows defines 'PostMessage', so we have to undef it.
@@ -247,12 +247,12 @@ ChromotingInstance::ChromotingInstance(PP_Instance pp_instance)
   // Initialize random seed for libjingle. It's necessary only with OpenSSL.
   char random_seed[kRandomSeedSize];
   crypto::RandBytes(random_seed, sizeof(random_seed));
-  talk_base::InitRandom(random_seed, sizeof(random_seed));
+  rtc::InitRandom(random_seed, sizeof(random_seed));

[Wez, 2014/07/31 21:22:53]

Why rtc and not webrtc?

[hellner1, 2014/07/31 21:36:27]

Discussed here:
https://docs.google.com/a/google.com/document/d/1jIFupXQO5OX5mmEugjHkoneo72Hq...
and here
https://docs.google.com/a/google.com/document/d/11DDtsAgrIO5xuThqMd7NuTCaM_1N...
basically the merged library contains more than webrtc.

 #else
   // Libjingle's SSL implementation is not really used, but it has to be
   // initialized for NSS builds to make sure that RNG is initialized in NSS,
   // because libjingle uses it.
-  talk_base::InitializeSSL();
+  rtc::InitializeSSL();
 #endif  // !defined(USE_OPENSSL)
 
   // Send hello message.