Attempt to repair corrupt enterprise policy force-installed extensions

chrome/browser/extensions/pending_extension_manager.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_
 #define CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_
 
 #include <list>
+#include <map>
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
+#include "base/time/time.h"
 #include "chrome/browser/extensions/pending_extension_info.h"
 #include "extensions/common/manifest.h"
 
 class GURL;
 
 namespace base {
 class Version;
 }
 
 namespace content {
@@ skipping 37 matching lines @@
 
   // Is |id| in the set of pending extensions?
   bool IsIdPending(const std::string& id) const;
 
   // Returns true if there are any extensions pending.
   bool HasPendingExtensions() const;
 
   // Whether there is pending extension install from sync.
   bool HasPendingExtensionFromSync() const;
 
+  // Notify the manager that we are reinstalling the policy force-installed

[lazyboy, 2016/09/02 19:21:53]

nit: Notifies the manager...
Also I'd be more clear in the description and in the function name (which
admittedly becomes ugly) that this is only for policy extension's content
corruption.
(you can probably suggest a better name)
void ExpectPolicyExtensionReinstallDueToCorruption()

The worry is that folks don't misinterpret this as generic reinstall mechanism
while changing the code in the future...

[asargent_no_longer_on_chrome, 2016/09/09 03:30:44]

Done. Used "ExpectPolicyReinstallForCorruption" ("extension" is implied by the
extensions namespace and location in the codebase)

+  // extension with |id|.
+  void ExpectPolicyReinstall(const std::string& id);

[lazyboy, 2016/09/02 19:21:53]

nit: use ExtensionId (which is a string) for new extension id types.

[asargent_no_longer_on_chrome, 2016/09/09 03:30:44]

Done.

+
+  // Are we expecting a reinstall of the extension with |id|?
+  bool IsPolicyReinstallExpected(const std::string& id) const;
+
   // Adds an extension in a pending state; the extension with the
   // given info will be installed on the next auto-update cycle.
   // Return true if the extension was added.  Will return false
   // if the extension is pending from another source which overrides
   // sync installs (such as a policy extension) or if the extension
   // is already installed.
   // After installation, the extension will be granted permissions iff
   // |version| is valid and matches the actual installed version.
   bool AddFromSync(
       const std::string& id,
@@ skipping 53 matching lines @@
   // Add a pending extension record directly.  Used for unit tests that need
   // to set an inital state. Use friendship to allow the tests to call this
   // method.
   void AddForTesting(const PendingExtensionInfo& pending_extension_info);
 
   // The BrowserContext with which the manager is associated.
   content::BrowserContext* context_;
 
   PendingExtensionList pending_extension_list_;
 
+  // A set of policy force-installed extension ids that are being reinstalled
+  // due to corruption, mapped to the time we detected the corruption.
+  std::map<std::string, base::TimeTicks> expected_policy_reinstalls_;
+
   FRIEND_TEST_ALL_PREFIXES(::ExtensionServiceTest,
                            UpdatePendingExtensionAlreadyInstalled);
   friend class ExtensionUpdaterTest;
   friend void SetupPendingExtensionManagerForTest(
       int count, const GURL& update_url,
       PendingExtensionManager* pending_extension_manager);
 
   DISALLOW_COPY_AND_ASSIGN(PendingExtensionManager);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_