Fix subtle dynamic library loading problem and deflake the tree.

shell/application_manager/network_fetcher.h

Index: shell/application_manager/network_fetcher.h
diff --git a/shell/application_manager/network_fetcher.h b/shell/application_manager/network_fetcher.h
index ff4152724ccbe97ba9c21f9e92255c563098d178..e9f9b950848dce0342b53f1fb3810efa30df8a54 100644
--- a/shell/application_manager/network_fetcher.h
+++ b/shell/application_manager/network_fetcher.h
@@ -43,10 +43,12 @@ class NetworkFetcher : public Fetcher {
 
   // AppIds should be be both predictable and unique, but any hash would work.
   // Currently we use sha256 from crypto/secure_hash.h
-  static bool ComputeAppId(const base::FilePath& path,
+  static bool ComputeAppId(const GURL& canonical_url,
+                           const base::FilePath& path,
                            std::string* digest_string);
 
-  static bool RenameToAppId(const base::FilePath& old_path,
+  static bool RenameToAppId(const GURL& canonical_url,
+                            const base::FilePath& old_path,
                             base::FilePath* new_path);
 
   void CopyCompleted(base::Callback<void(const base::FilePath&, bool)> callback,