Revert "Update webrtc&libjingle 6774:6799."

remoting/protocol/message_reader_unittest.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 <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "net/base/net_errors.h"
 #include "net/socket/socket.h"
 #include "remoting/protocol/fake_session.h"
 #include "remoting/protocol/message_reader.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/webrtc/base/byteorder.h"
+#include "third_party/libjingle/source/talk/base/byteorder.h"
 
 using testing::_;
 using testing::DoAll;
 using testing::Mock;
 using testing::SaveArg;
 
 namespace remoting {
 namespace protocol {
 
 namespace {
@@ skipping 44 matching lines @@
     STLDeleteElements(&messages_);
   }
 
   void InitReader() {
     reader_->Init(&socket_, base::Bind(
         &MessageReaderTest::OnMessage, base::Unretained(this)));
   }
 
   void AddMessage(const std::string& message) {
     std::string data = std::string(4, ' ') + message;
-    rtc::SetBE32(const_cast<char*>(data.data()), message.size());
+    talk_base::SetBE32(const_cast<char*>(data.data()), message.size());
 
     socket_.AppendInputData(std::vector<char>(data.begin(), data.end()));
   }
 
   bool CompareResult(CompoundBuffer* buffer, const std::string& expected) {
     std::string result(buffer->total_bytes(), ' ');
     buffer->CopyTo(const_cast<char*>(result.data()), result.size());
     return result == expected;
   }
 
@@ skipping 222 matching lines @@
   EXPECT_CALL(callback_, OnMessage(_))
       .Times(1)
       .WillOnce(Invoke(this, &MessageReaderTest::DeleteReader));
 
   InitReader();
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace protocol
 }  // namespace remoting