Disable install of new default_apps for existing users

chrome/browser/extensions/default_apps.h

Index: chrome/browser/extensions/default_apps.h
diff --git a/chrome/browser/extensions/default_apps.h b/chrome/browser/extensions/default_apps.h
index 7c13c8cda4b057debc485463735913061aa89823..205e1ff1751d02a1b26cf0759048491d23174767 100644
--- a/chrome/browser/extensions/default_apps.h
+++ b/chrome/browser/extensions/default_apps.h
@@ -15,6 +15,10 @@ namespace extensions {
 class Extension;
 }
 
+namespace base {
+class DictionaryValue;
+}
+
 // Functions and types related to installing default apps.
 namespace default_apps {
 
@@ -28,10 +32,6 @@ enum InstallState {
   kAlreadyInstalledDefaultApps
 };
 
-bool ShouldInstallInProfile(Profile* profile);
-
-bool isLocaleSupported();
-
 // Register preference properties used by default apps to maintain
 // install state.
 void RegisterUserPrefs(PrefService* prefs);
@@ -48,11 +48,15 @@ class Provider : public extensions::ExternalProviderImpl {
            extensions::Extension::Location download_location,
            int creation_flags);
 
+  static bool ShouldInstallInProfile(Profile* profile);

[Mihai Parparita -not on Chrome, 2012/08/29 00:51:18]

Making these static just so you don't have to instantiate a Provider in test
code is a bad idea. There can be multiple Provider instances alive in a Chrome
process (one per profile), and they will clobber each other's isMigration flags.

You should be able to instantiate a Provider in the test, there's a
TestingProfile, VisitorInterface should be easy to mock, as is ExternalLoader.

[Gaurav, 2012/08/29 07:45:46]

I just tried implementing it by mocking both Provider and Loader. However the
destructor of Provider contains a check
"CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI))" which is FATAL for
unittest. Any idea how should I deal with this

Thanks

On 2012/08/29 00:51:18, Mihai Parparita wrote:

+
   // ExternalProviderImpl overrides:
   virtual void VisitRegisteredExtension() OVERRIDE;
+  virtual void SetPrefs(base::DictionaryValue* prefs) OVERRIDE;
 
  private:
   Profile* profile_;
+  static bool isMigration_;

[Mihai Parparita -not on Chrome, 2012/08/29 00:51:18]

This should be called is_migration_.

 
   DISALLOW_COPY_AND_ASSIGN(Provider);
 };