Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(358)

Unified Diff: remoting/client/plugin/chromoting_instance.cc

Issue 429113002: Webrtc deps roll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use webrtc version 6825 and rebase and switch back to original workspace. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/DEPS ('k') | remoting/client/plugin/pepper_network_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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>
+#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));
#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.
« no previous file with comments | « remoting/DEPS ('k') | remoting/client/plugin/pepper_network_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698