Move timeout timer into WebApkIconHasher

chrome/browser/android/webapk/webapk_update_data_fetcher.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_update_data_fetcher.h"
 
 #include <jni.h>
 #include <vector>
 
 #include "base/android/jni_array.h"
@@ skipping 134 matching lines @@
       !AreWebManifestUrlsWebApkCompatible(data.manifest)) {
     OnWebManifestNotWebApkCompatible();
     return;
   }
 
   info_.UpdateFromManifest(data.manifest);
   info_.manifest_url = data.manifest_url;
   info_.best_primary_icon_url = data.primary_icon_url;
   best_primary_icon_ = *data.primary_icon;
 
-  icon_hasher_.reset(new WebApkIconHasher());
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
-  icon_hasher_->DownloadAndComputeMurmur2Hash(
+
+  icon_hasher_.reset(new WebApkIconHasher(
       profile->GetRequestContext(), data.primary_icon_url,
       base::Bind(&WebApkUpdateDataFetcher::OnGotIconMurmur2Hash,
-                 weak_ptr_factory_.GetWeakPtr()));
+                 weak_ptr_factory_.GetWeakPtr())));
+  icon_hasher_->DownloadAndComputeMurmur2Hash();
 }
 
 void WebApkUpdateDataFetcher::OnGotIconMurmur2Hash(
     const std::string& best_primary_icon_murmur2_hash) {
   icon_hasher_.reset();
 
   if (best_primary_icon_murmur2_hash.empty()) {
     OnWebManifestNotWebApkCompatible();
     return;
   }
@@ skipping 34 matching lines @@
       info.theme_color, info.background_color);
 }
 
 void WebApkUpdateDataFetcher::OnWebManifestNotWebApkCompatible() {
   if (!is_initial_fetch_)
     return;
 
   Java_WebApkUpdateDataFetcher_onWebManifestForInitialUrlNotWebApkCompatible(
       base::android::AttachCurrentThread(), java_ref_);
 }