Remove leftover conflict markers from proxy_service_unittest.cc

net/proxy/proxy_service_unittest.cc

Index: net/proxy/proxy_service_unittest.cc
diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc
index 7813e339b9e7965986dc9c1c545c3b0c5c2a8e9c..c57b23834f90683b68f594eb962f5dd284b2adfd 100644
--- a/net/proxy/proxy_service_unittest.cc
+++ b/net/proxy/proxy_service_unittest.cc
@@ -2088,13 +2088,8 @@ TEST_F(ProxyServiceTest, InitialPACScriptDownload) {
   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/ )
@@ -2337,13 +2332,8 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac) {
   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/ )
@@ -2427,13 +2417,8 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac2) {
   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/ )