Revert of Enable forced extension updates on NaCl arch mismatch

chrome/browser/extensions/updater/extension_downloader.cc

Index: chrome/browser/extensions/updater/extension_downloader.cc
diff --git a/chrome/browser/extensions/updater/extension_downloader.cc b/chrome/browser/extensions/updater/extension_downloader.cc
index d8f183c153e875416294763b47c6fc827460b684..264e461e535723dd8b85b0cd820ec9789d3d5a6d 100644
--- a/chrome/browser/extensions/updater/extension_downloader.cc
+++ b/chrome/browser/extensions/updater/extension_downloader.cc
@@ -28,7 +28,6 @@
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
-#include "components/omaha_query_params/omaha_query_params.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
@@ -45,7 +44,6 @@
 using base::Time;
 using base::TimeDelta;
 using content::BrowserThread;
-using omaha_query_params::OmahaQueryParams;
 
 namespace extensions {
 
@@ -86,7 +84,6 @@
 
 const char kNotFromWebstoreInstallSource[] = "notfromwebstore";
 const char kDefaultInstallSource[] = "";
-const char kWrongMultiCrxInstallSource[] = "wrong_multi_crx";
 
 const char kGoogleDotCom[] = "google.com";
 const char kTokenServiceConsumerId[] = "extension_downloader";
@@ -213,24 +210,10 @@
   if (!ManifestURL::UpdatesFromGallery(&extension))
     update_url_data = delegate_->GetUpdateUrlData(extension.id());
 
-  // If the browser's native architecture has changed since this extension was
-  // installed, we need to force an update.
-  bool force_update = false;
-  std::string install_source;
-  if (extension.HasPlatformSpecificResources() &&
-      !extension.HasResourcesForPlatform(OmahaQueryParams::GetNaclArch())) {
-    force_update = true;
-    install_source = kWrongMultiCrxInstallSource;
-  }
-
-  return AddExtensionData(extension.id(),
-                          *extension.version(),
+  return AddExtensionData(extension.id(), *extension.version(),
                           extension.GetType(),
                           ManifestURL::GetUpdateURL(&extension),
-                          update_url_data,
-                          request_id,
-                          force_update,
-                          install_source);
+                          update_url_data, request_id);
 }
 
 bool ExtensionDownloader::AddPendingExtension(const std::string& id,
@@ -247,9 +230,7 @@
                           Manifest::TYPE_UNKNOWN,
                           update_url,
                           std::string(),
-                          request_id,
-                          false,
-                          std::string());
+                          request_id);
 }
 
 void ExtensionDownloader::StartAllPending(ExtensionCache* cache) {
@@ -292,8 +273,7 @@
                                 version,
                                 &ping_data,
                                 std::string(),
-                                kDefaultInstallSource,
-                                false);
+                                kDefaultInstallSource);
   StartUpdateCheck(blacklist_fetch.Pass());
 }
 
@@ -302,15 +282,12 @@
   identity_provider_.swap(identity_provider);
 }
 
-bool ExtensionDownloader::AddExtensionData(
-    const std::string& id,
-    const Version& version,
-    Manifest::Type extension_type,
-    const GURL& extension_update_url,
-    const std::string& update_url_data,
-    int request_id,
-    bool force_update,
-    const std::string& install_source_override) {
+bool ExtensionDownloader::AddExtensionData(const std::string& id,
+                                           const Version& version,
+                                           Manifest::Type extension_type,
+                                           const GURL& extension_update_url,
+                                           const std::string& update_url_data,
+                                           int request_id) {
   GURL update_url(extension_update_url);
   // Skip extensions with non-empty invalid update URLs.
   if (!update_url.is_empty() && !update_url.is_valid()) {
@@ -376,9 +353,6 @@
 
     std::string install_source = i == 0 ?
         kDefaultInstallSource : kNotFromWebstoreInstallSource;
-    if (!install_source_override.empty()) {
-      install_source = install_source_override;
-    }
 
     ManifestFetchData::PingData ping_data;
     ManifestFetchData::PingData* optional_ping_data = NULL;
@@ -395,8 +369,7 @@
       ManifestFetchData* existing_fetch = existing_iter->second.back().get();
       if (existing_fetch->AddExtension(id, version.GetString(),
                                        optional_ping_data, update_url_data,
-                                       install_source,
-                                       force_update)) {
+                                       install_source)) {
         added = true;
       }
     }
@@ -410,8 +383,7 @@
       added = fetch->AddExtension(id, version.GetString(),
                                   optional_ping_data,
                                   update_url_data,
-                                  install_source,
-                                  force_update);
+                                  install_source);
       DCHECK(added);
     }
   }
@@ -667,14 +639,12 @@
 
       VLOG(2) << id << " is at '" << version << "'";
 
-      // We should skip the version check if update was forced.
-      if (!fetch_data.DidForceUpdate(id)) {
-        Version existing_version(version);
-        Version update_version(update->version);
-        if (!update_version.IsValid() ||
-            update_version.CompareTo(existing_version) <= 0) {
-          continue;
-        }
+      Version existing_version(version);
+      Version update_version(update->version);
+
+      if (!update_version.IsValid() ||
+          update_version.CompareTo(existing_version) <= 0) {
+        continue;
       }
     }