Webrtc deps roll.

remoting/client/plugin/chromoting_instance.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/client/plugin/chromoting_instance.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #if defined(OS_NACL)
+#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>
-#include <nacl_io/nacl_io.h>
 #endif
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
@@ skipping 21 matching lines @@
 #include "remoting/client/plugin/normalizing_input_filter_mac.h"
 #include "remoting/client/plugin/pepper_audio_player.h"
 #include "remoting/client/plugin/pepper_input_handler.h"
 #include "remoting/client/plugin/pepper_port_allocator.h"
 #include "remoting/client/plugin/pepper_view.h"
 #include "remoting/client/software_video_renderer.h"
 #include "remoting/client/token_fetcher_proxy.h"
 #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.
 #if defined(PostMessage)
 #undef PostMessage
 #endif
 
 namespace remoting {
 
 namespace {
@@ skipping 173 matching lines @@
   RequestInputEvents(PP_INPUTEVENT_CLASS_MOUSE | PP_INPUTEVENT_CLASS_WHEEL);
   RequestFilteringInputEvents(PP_INPUTEVENT_CLASS_KEYBOARD);
 
   // Resister this instance to handle debug log messsages.
   RegisterLoggingInstance();
 
 #if defined(USE_OPENSSL)
   // 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.
   scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
   data->SetInteger("apiVersion", kApiVersion);
   data->SetString("apiFeatures", kApiFeatures);
   data->SetInteger("apiMinVersion", kApiMinMessagingVersion);
   data->SetString("requestedCapabilities", kRequestedCapabilities);
   data->SetString("supportedCapabilities", kSupportedCapabilities);
 
@@ skipping 966 matching lines @@
   void* data_ptr = array_buffer.Map();
   memcpy(data_ptr, buffer, buffer_size);
   array_buffer.Unmap();
   pp::VarDictionary data_dictionary;
   data_dictionary.Set(pp::Var("buffer"), array_buffer);
   data_dictionary.Set(pp::Var("keyframe"), keyframe);
   PostChromotingMessage("mediaSourceData", data_dictionary);
 }
 
 }  // namespace remoting