Roll WebRTC 12681:12729, Libjingle 12581:12686

remoting/protocol/http_ice_config_request_unittest.cc

 // Copyright 2016 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/protocol/http_ice_config_request.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "remoting/base/url_request.h"
@@ skipping 41 matching lines @@
       UrlRequest::Type type,
       const std::string& url) override {
     EXPECT_EQ(UrlRequest::Type::POST, type);
     CHECK(results_.count(url));
     return base::WrapUnique(new FakeUrlRequest(results_[url]));
   }
 
   std::map<std::string, UrlRequest::Result> results_;
 };
 
-bool operator==(const cricket::ProtocolAddress& a,
-                const cricket::ProtocolAddress& b) {
-  return a.address == b.address && a.proto == b.proto && a.secure == b.secure;
-}
-bool operator==(const cricket::RelayServerConfig& a,
-                const cricket::RelayServerConfig& b) {
-  if (a.ports.size() != b.ports.size())
-    return false;
-  for (size_t i = 0; i < a.ports.size(); ++i) {
-    if (!(a.ports[i] == b.ports[i]))
-      return false;
-  }
-  return a.type == b.type &&
-         a.credentials.username == b.credentials.username &&
-         a.credentials.password == b.credentials.password;
-}
-
 }  // namespace
 
 static const char kTestUrl[] = "http://host/ice_config";
 
 class HttpIceConfigRequestTest : public testing::Test {
  public:
   void OnResult(const IceConfig& config) {
     received_config_ = base::WrapUnique(new IceConfig(config));
   }
 
@@ skipping 115 matching lines @@
 TEST_F(HttpIceConfigRequestTest, FailedRequest) {
   url_request_factory_.SetResult(kTestUrl, UrlRequest::Result::Failed());
   request_.reset(new HttpIceConfigRequest(&url_request_factory_, kTestUrl));
   request_->Send(
       base::Bind(&HttpIceConfigRequestTest::OnResult, base::Unretained(this)));
   EXPECT_TRUE(received_config_->is_null());
 }
 
 }  // namespace protocol
 }  // namespace remoting