Check multi-crx path for force update based on manifest entries

chrome/browser/extensions/updater/extension_updater.cc

 // Copyright (c) 2012 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/extensions/updater/extension_updater.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
-#include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/module/module.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.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"
 #include "content/public/browser/notification_source.h"
 #include "crypto/sha2.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/pref_names.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest.h"
+#include "extensions/common/manifest_constants.h"
 
 using base::RandDouble;
 using base::RandInt;
 using base::Time;
 using base::TimeDelta;
 using content::BrowserThread;
 using extensions::Extension;
 using extensions::ExtensionSet;
 using omaha_query_params::OmahaQueryParams;
 
@@ skipping 62 matching lines @@
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
   for (std::vector<scoped_refptr<const Extension> >::const_iterator iter =
           extensions->begin();
        iter != extensions->end();
        ++iter) {
     scoped_refptr<const Extension> extension = *iter;
     base::FilePath platform_specific_path = extension->path().Append(
         extensions::kPlatformSpecificFolder);
     if (base::PathExists(platform_specific_path)) {
       bool force = true;
-      base::FileEnumerator all_archs(platform_specific_path,
-                                     false,
-                                     base::FileEnumerator::DIRECTORIES);
-      base::FilePath arch;
-      while (!(arch = all_archs.Next()).empty()) {
-        std::string arch_name = arch.BaseName().AsUTF8Unsafe();
-        std::replace(arch_name.begin(), arch_name.end(), '_', '-');
-        if (arch_name == OmahaQueryParams::GetNaclArch())
-          force = false;
+      const base::ListValue* platforms;
+      if (extension->manifest()->GetList(extensions::manifest_keys::kPlatforms,
+                                         &platforms)) {
+        for (size_t i = 0; i < platforms->GetSize(); ++i) {
+          const base::DictionaryValue* p;
+          if (platforms->GetDictionary(i, &p)) {
+            std::string nacl_arch;
+            if (p->GetString(extensions::manifest_keys::kNaClArch,
+                             &nacl_arch) &&
+                nacl_arch == OmahaQueryParams::GetNaclArch()) {
+              std::string subpath;
+              if (p->GetString(extensions::manifest_keys::kSubPackagePath,
+                               &subpath)) {
+                // _platform_specific is part of the sub_package_path entry.
+                base::FilePath platform_specific_subpath =
+                    extension->path().Append(subpath);

[Ken Rockot(use gerrit already), 2014/09/24 16:14:15]

You want AppendASCII here

[elijahtaylor1, 2014/09/24 16:35:48]

Done.

+                if (base::PathExists(platform_specific_subpath)) {
+                  force = false;
+                }
+              }
+            }
+          }
+        }
       }
 
       if (force)
         forced_updates->insert(extension->id());
    }
   }
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&RespondWithForcedUpdates,
@@ skipping 602 matching lines @@
   const InProgressCheck& request = requests_in_progress_[request_id];
   if (request.in_progress_ids_.empty()) {
     VLOG(2) << "Finished update check " << request_id;
     if (!request.callback.is_null())
       request.callback.Run();
     requests_in_progress_.erase(request_id);
   }
 }
 
 }  // namespace extensions