Move timeout timer into WebApkIconHasher

chrome/browser/android/webapk/webapk_icon_hasher_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 "chrome/browser/android/webapk/webapk_icon_hasher.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback_forward.h"
@@ skipping 19 matching lines @@
 
 // Runs WebApkIconHasher and blocks till the murmur2 hash is computed.
 class WebApkIconHasherRunner {
  public:
   WebApkIconHasherRunner()
       : url_request_context_getter_(new net::TestURLRequestContextGetter(
             base::ThreadTaskRunnerHandle::Get())) {}
   ~WebApkIconHasherRunner() {}
 
   void Run(const GURL& icon_url) {
-    WebApkIconHasher hasher;
-    hasher.DownloadAndComputeMurmur2Hash(
-        url_request_context_getter_.get(), icon_url,
+    WebApkIconHasher hasher(url_request_context_getter_.get(), icon_url,
         base::Bind(&WebApkIconHasherRunner::OnCompleted,
                    base::Unretained(this)));
+    hasher.DownloadAndComputeMurmur2Hash();
 
     base::RunLoop run_loop;
     on_completed_callback_ = run_loop.QuitClosure();
     run_loop.Run();
   }
 
   const std::string& murmur2_hash() { return murmur2_hash_; }
 
  private:
   void OnCompleted(const std::string& murmur2_hash) {
@@ skipping 51 matching lines @@
   EXPECT_EQ("536500236142107998", runner.murmur2_hash());
 }
 
 TEST_F(WebApkIconHasherTest, DataUriInvalid) {
   GURL icon_url("data:image/png;base64");
   WebApkIconHasherRunner runner;
   runner.Run(icon_url);
   EXPECT_EQ("", runner.murmur2_hash());
 }
 
+TEST_F(WebApkIconHasherTest, InvalidUrl) {
+  GURL icon_url("http::google.com");
+  WebApkIconHasherRunner runner;
+  runner.Run(icon_url);
+  EXPECT_EQ("", runner.murmur2_hash());
+}
+
+TEST_F(WebApkIconHasherTest, DownloadTimedOut) {
+  GURL icon_url = test_server()->GetURL("/slow?100");
+  WebApkIconHasherRunner runner;
+  runner.Run(icon_url);
+  EXPECT_EQ("", runner.murmur2_hash());
+}
+
 // Test that the hash callback is called with an empty string if an HTTP error
 // prevents the icon URL from being fetched.
 TEST_F(WebApkIconHasherTest, HTTPError) {
   GURL icon_url = test_server()->GetURL("/nocontent");
   WebApkIconHasherRunner runner;
   runner.Run(icon_url);
   EXPECT_EQ("", runner.murmur2_hash());
 }