Remove race condition when installing default apps into a new profile.

chrome/browser/extensions/external_extension_provider_impl.h

Index: chrome/browser/extensions/external_extension_provider_impl.h
===================================================================
--- chrome/browser/extensions/external_extension_provider_impl.h	(revision 105797)
+++ chrome/browser/extensions/external_extension_provider_impl.h	(working copy)
@@ -10,6 +10,8 @@
 
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/extensions/external_extension_loader.h"
+#include "content/common/notification_observer.h"
+#include "content/common/notification_registrar.h"
 
 class ExternalExtensionLoader;
 class Profile;
@@ -50,7 +52,7 @@
 
   // Sets underlying prefs and notifies provider. Only to be called by the
   // owned ExternalExtensionLoader instance.
-  void SetPrefs(base::DictionaryValue* prefs);
+  virtual void SetPrefs(base::DictionaryValue* prefs);

[Mihai Parparita -not on Chrome, 2011/10/19 07:31:36]

I'm getting uncomfortable with the increased overriding of methods from
ExternalExtensionProviderImpl so that you can implement DefaultAppsProvider,
since the two classes are becoming tightly coupled. 

The preferred design would be to either have a whole new
ExternalExtensionProviderInterface implementation, or to implement a new
ExternalExtensionLoader that you can plug into ExternalExtensionProviderImpl

[Roger Tawa OOO till Jul 10th, 2011/10/19 20:48:25]

I could create a separate implementation of ExternalExtensionProviderInterface,
but the implementation would have a lot of duplicate code with
ExternalExtensionProviderImpl, so I would likely create a base class anyway. 
Not sure that makes much of a difference then.

Also, the relationship between the loaders and the the provider implementation
is itself tightly coupled.  For example, ExternalExtensionLoader::Init() takes a
ExternalExtensionProviderImpl pointer directly, and not an
ExternalExtensionProviderInterface.  If this interface had a SetPrefs(), then
this could be cleaned up.  This would of course make SetPrefs() virtual in any
case.

I can make this change to the interface if you like and clean up the code if
this is the correct approach, let me know.

The default apps provider needs to do some things that cannot be done as an
extension loader only.  For example, it needs to know if the extensions are
valid and supported, even if they did load successfully.  Furthermore, the
loader could not simply say "there are no extensions to load" if the profile is
detected to already have apps, since then its provider could not implement
HasExtension() and GetExtensionDetails().

 
   // ExternalExtensionProvider implementation:
   virtual void ServiceShutdown() OVERRIDE;
@@ -69,9 +71,16 @@
   static const char kExternalUpdateUrl[];
   static const char kSupportedLocales[];
 
+  // Used only for testing.
+  const std::set<std::string>& invalid_extensions() const {
+    return invalid_extensions_;
+  }
+
  protected:
   VisitorInterface* service() const { return service_; }
 
+  base::DictionaryValue* prefs() const { return prefs_.get(); }
+
  private:
   // Location for external extensions that are provided by this provider from
   // local crx files.
@@ -96,7 +105,57 @@
   // via |SetPrefs|.
   scoped_refptr<ExternalExtensionLoader> loader_;
 
+  // Extensions that were found to be invalid while processing the prefs_
+  // dictionary.  These are extensions that this provider did not even attempt
+  // to install because they failed one or more of the checks in SetPrefs().
+  //
+  // TODO(mihai): It would be nice to simply remove these extensions from
+  // prefs_, but for now, there is code that depends on these invalid extensions

[Mihai Parparita -not on Chrome, 2011/10/19 07:31:36]

What code are you referring to here?

[Roger Tawa OOO till Jul 10th, 2011/10/19 20:48:25]

If you look at patch set #1 of this CL, I was adding extensions that were deemed
invalid to the unsupported set.  In a private email you sent me, you worried
that because this would make those extensions unavailable to HasExtension(),
this might cause problems with existing code.  However, you said it would be
good to clean this up eventually.

+  // still being available to HasExtension().  See how to fix this.
+  std::set<std::string> invalid_extensions_;
+
   DISALLOW_COPY_AND_ASSIGN(ExternalExtensionProviderImpl);
 };
 
+#if !defined(OS_CHROMEOS)
+class DefaultAppsProvider : public ExternalExtensionProviderImpl,

[Mihai Parparita -not on Chrome, 2011/10/19 07:31:36]

Now that you're exposing this class in the header file and it's gotten pretty
big, you should probably move it to its own .h/.cc file. Also, then you can
exclude those files from the Chrome OS build via a Gyp condition instead of
needing preprocessor wrappers.

[Finnur, 2011/10/19 10:01:29]

+1

On 2011/10/19 07:31:36, Mihai Parparita wrote:

[Roger Tawa OOO till Jul 10th, 2011/10/19 20:48:25]

Done.

[Roger Tawa OOO till Jul 10th, 2011/10/19 20:48:25]

Done.

+                            public NotificationObserver {
+ public:
+  DefaultAppsProvider(VisitorInterface* service,
+                      ExternalExtensionLoader* loader,
+                      Profile* profile);
+  virtual ~DefaultAppsProvider();
+
+  // ExternalExtensionProviderImpl overrides:
+  virtual void SetPrefs(base::DictionaryValue* prefs) OVERRIDE;
+  virtual void ServiceShutdown() OVERRIDE;
+  virtual void VisitRegisteredExtension() const OVERRIDE;
+
+  // Implementation of NotificationObserver:
+  virtual void Observe(int type,
+                       const NotificationSource& source,
+                       const NotificationDetails& details) OVERRIDE;
+
+  // Used only for testing.
+  const std::set<std::string>& install_error_extensions() const {
+    return install_error_extensions_;
+  }
+
+  enum InstallState {

[Finnur, 2011/10/19 10:01:29]

Perhaps document that the values of these enums are written to the user's
profile, so they must not change?

[Roger Tawa OOO till Jul 10th, 2011/10/19 20:48:25]

Done.

+    kInstallNotStarted,
+    kInstalling,
+    kInstallDone
+  };

[Finnur, 2011/10/19 10:01:29]

nit: enum should be at the top of the public section.

[Roger Tawa OOO till Jul 10th, 2011/10/19 20:48:25]

Done.

+
+ private:
+  Profile* profile_;
+  NotificationRegistrar registrar_;
+
+  // Set of extensions that failed to install for some reason.
+  std::set<std::string> install_error_extensions_;
+
+  DISALLOW_COPY_AND_ASSIGN(DefaultAppsProvider);
+};
+#endif
+
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTERNAL_EXTENSION_PROVIDER_IMPL_H_