Remove unused resolve functionality from HttpAuthHandlerMock.

Remove some dead code from HttpAuthHandlerMock: SetResolveExpectation(),
NeedsCanonicalName(), ResolveCanonicalName(), OnResolveCanonicalName()
methods, Resolve enum, resolve_ member.

Change-Id: I87a7904f41433eb5e649ddc039e6d12ceb211edd
Reviewed-on: https://chromium-review.googlesource.com/1154347Reviewed-by: Eric Roman <eroman@chromium.org>
Commit-Queue: Bence Béky <bnc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579547}

net/http/http_auth_handler_mock.cc

@@ -41,7 +41,6 @@ void PrintTo(const HttpAuthHandlerMock::State& state, ::std::ostream* os) {
 
 HttpAuthHandlerMock::HttpAuthHandlerMock()
     : state_(State::WAIT_FOR_INIT),
-      resolve_(RESOLVE_INIT),
       generate_async_(false),
       generate_rv_(OK),
       auth_token_(NULL),
@@ -53,48 +52,6 @@ HttpAuthHandlerMock::HttpAuthHandlerMock()
 
 HttpAuthHandlerMock::~HttpAuthHandlerMock() = default;
 
-void HttpAuthHandlerMock::SetResolveExpectation(Resolve resolve) {
-  EXPECT_EQ(RESOLVE_INIT, resolve_);
-  resolve_ = resolve;
-}
-
-bool HttpAuthHandlerMock::NeedsCanonicalName() {
-  switch (resolve_) {
-    case RESOLVE_SYNC:
-    case RESOLVE_ASYNC:
-      return true;
-    case RESOLVE_SKIP:
-      resolve_ = RESOLVE_TESTED;
-      return false;
-    default:
-      NOTREACHED();
-      return false;
-  }
-}
-
-int HttpAuthHandlerMock::ResolveCanonicalName(
-    HostResolver* host_resolver, const CompletionCallback& callback) {
-  EXPECT_NE(RESOLVE_TESTED, resolve_);
-  int rv = OK;
-  switch (resolve_) {
-    case RESOLVE_SYNC:
-      resolve_ = RESOLVE_TESTED;
-      break;
-    case RESOLVE_ASYNC:
-      EXPECT_TRUE(callback_.is_null());
-      rv = ERR_IO_PENDING;
-      callback_ = callback;
-      base::ThreadTaskRunnerHandle::Get()->PostTask(
-          FROM_HERE, base::Bind(&HttpAuthHandlerMock::OnResolveCanonicalName,
-                                weak_factory_.GetWeakPtr()));
-      break;
-    default:
-      NOTREACHED();
-      break;
-  }
-  return rv;
-}
-
 void HttpAuthHandlerMock::SetGenerateExpectation(bool async, int rv) {
   generate_async_ = async;
   generate_rv_ = rv;
@@ -172,13 +129,6 @@ int HttpAuthHandlerMock::GenerateAuthTokenImpl(
   }
 }
 
-void HttpAuthHandlerMock::OnResolveCanonicalName() {
-  EXPECT_EQ(RESOLVE_ASYNC, resolve_);
-  EXPECT_TRUE(!callback_.is_null());
-  resolve_ = RESOLVE_TESTED;
-  base::ResetAndReturn(&callback_).Run(OK);
-}
-
 void HttpAuthHandlerMock::OnGenerateAuthToken() {
   EXPECT_TRUE(generate_async_);
   EXPECT_TRUE(!callback_.is_null());

net/http/http_auth_handler_mock.h

@@ -17,8 +17,6 @@
 
 namespace net {
 
-class HostResolver;
-
 // MockAuthHandler is used in tests to reliably trigger edge cases.
 class HttpAuthHandlerMock : public HttpAuthHandler {
  public:
@@ -30,14 +28,6 @@ class HttpAuthHandlerMock : public HttpAuthHandler {
     DONE
   };
 
-  enum Resolve {
-    RESOLVE_INIT,
-    RESOLVE_SKIP,
-    RESOLVE_SYNC,
-    RESOLVE_ASYNC,
-    RESOLVE_TESTED,
-  };
-
   // The Factory class returns handlers in the order they were added via
   // AddMockHandler.
   class Factory : public HttpAuthHandlerFactory {
@@ -71,13 +61,6 @@ class HttpAuthHandlerMock : public HttpAuthHandler {
 
   ~HttpAuthHandlerMock() override;
 
-  void SetResolveExpectation(Resolve resolve);
-
-  virtual bool NeedsCanonicalName();
-
-  virtual int ResolveCanonicalName(HostResolver* host_resolver,
-                                   const CompletionCallback& callback);
-
 
   void SetGenerateExpectation(bool async, int rv);
 
@@ -116,12 +99,9 @@ class HttpAuthHandlerMock : public HttpAuthHandler {
                             std::string* auth_token) override;
 
  private:
-  void OnResolveCanonicalName();
-
   void OnGenerateAuthToken();
 
   State state_;
-  Resolve resolve_;
   CompletionCallback callback_;
   bool generate_async_;
   int generate_rv_;