Remove leftover conflict markers from proxy_service_unittest.cc

net/proxy/proxy_service_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 "net/proxy/proxy_service.h"
 
 #include <cstdarg>
 #include <string>
 #include <vector>
 
@@ skipping 2070 matching lines @@
 
   jobs[url3]->results()->UseNamedProxy("request3:80");
   jobs[url3]->CompleteNow(OK);
 
   jobs[url1]->results()->UseNamedProxy("request1:80");
   jobs[url1]->CompleteNow(OK);
 
   jobs[url2]->results()->UseNamedProxy("request2:80");
   jobs[url2]->CompleteNow(OK);
 
-  //<<<<<<< HEAD
-  //  // Complete and verify that requests ran as expected.
-  //  EXPECT_THAT(callback1.WaitForResult(), IsOk());
-  //=======
   // Complete and verify that jobs ran as expected.
   EXPECT_EQ(OK, callback1.WaitForResult());
-  //>>>>>>> parent of 9c8f424... Revert of Change
   // ProxyResolver::GetProxyForURL() to take a std::unique_ptr<Request>* rather
   // than a RequestHandle* (patchset #11 id:200001 of
   // https://codereview.chromium.org/1439053002/ )
   EXPECT_EQ("request1:80", info1.proxy_server().ToURI());
   EXPECT_FALSE(info1.proxy_resolve_start_time().is_null());
   EXPECT_FALSE(info1.proxy_resolve_end_time().is_null());
   EXPECT_LE(info1.proxy_resolve_start_time(), info1.proxy_resolve_end_time());
 
   EXPECT_THAT(callback2.WaitForResult(), IsOk());
   EXPECT_EQ("request2:80", info2.proxy_server().ToURI());
@@ skipping 222 matching lines @@
   // (which was initialized with custom PAC script).
 
   JobMap jobs = GetPendingJobsForURLs(resolver, url1, url2);
 
   // Complete the pending jobs.
   jobs[url2]->results()->UseNamedProxy("request2:80");
   jobs[url2]->CompleteNow(OK);
   jobs[url1]->results()->UseNamedProxy("request1:80");
   jobs[url1]->CompleteNow(OK);
 
-  //<<<<<<< HEAD
-  //  // Verify that requests ran as expected.
-  //  EXPECT_THAT(callback1.WaitForResult(), IsOk());
-  //=======
   // Verify that jobs ran as expected.
   EXPECT_EQ(OK, callback1.WaitForResult());
-  //>>>>>>> parent of 9c8f424... Revert of Change
   // ProxyResolver::GetProxyForURL() to take a std::unique_ptr<Request>* rather
   // than a RequestHandle* (patchset #11 id:200001 of
   // https://codereview.chromium.org/1439053002/ )
   EXPECT_EQ("request1:80", info1.proxy_server().ToURI());
   EXPECT_FALSE(info1.proxy_resolve_start_time().is_null());
   EXPECT_FALSE(info1.proxy_resolve_end_time().is_null());
   EXPECT_LE(info1.proxy_resolve_start_time(), info1.proxy_resolve_end_time());
 
   EXPECT_THAT(callback2.WaitForResult(), IsOk());
   EXPECT_EQ("request2:80", info2.proxy_server().ToURI());
@@ skipping 63 matching lines @@
   // (which was initialized with custom PAC script).
 
   JobMap jobs = GetPendingJobsForURLs(resolver, url1, url2);
 
   // Complete the pending jobs.
   jobs[url2]->results()->UseNamedProxy("request2:80");
   jobs[url2]->CompleteNow(OK);
   jobs[url1]->results()->UseNamedProxy("request1:80");
   jobs[url1]->CompleteNow(OK);
 
-  //<<<<<<< HEAD
-  //  // Verify that requests ran as expected.
-  //  EXPECT_THAT(callback1.WaitForResult(), IsOk());
-  //=======
   // Verify that jobs ran as expected.
   EXPECT_EQ(OK, callback1.WaitForResult());
-  //>>>>>>> parent of 9c8f424... Revert of Change
   // ProxyResolver::GetProxyForURL() to take a std::unique_ptr<Request>* rather
   // than a RequestHandle* (patchset #11 id:200001 of
   // https://codereview.chromium.org/1439053002/ )
   EXPECT_EQ("request1:80", info1.proxy_server().ToURI());
 
   EXPECT_THAT(callback2.WaitForResult(), IsOk());
   EXPECT_EQ("request2:80", info2.proxy_server().ToURI());
 }
 
 // Test that if all of auto-detect, a custom PAC script, and manual settings
@@ skipping 1247 matching lines @@
         GURL(test.sanitized_url_unstripped),
         helper.SanitizeUrl(raw_url, ProxyService::SanitizeUrlPolicy::UNSAFE));
 
     EXPECT_EQ(
         GURL(test.sanitized_url),
         helper.SanitizeUrl(raw_url, ProxyService::SanitizeUrlPolicy::SAFE));
   }
 }
 
 }  // namespace net