Fix bug in disabling sync for default apps

chrome/browser/extensions/extension_prefs.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/extension_prefs.h"
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 144 matching lines @@
 const char kPrefScriptableHosts[] = "scriptable_host";
 
 // The preference names for the old granted permissions scheme.
 const char kPrefOldGrantedFullAccess[] = "granted_permissions.full";
 const char kPrefOldGrantedHosts[] = "granted_permissions.host";
 const char kPrefOldGrantedAPIs[] = "granted_permissions.api";
 
 // A preference that indicates when an extension was installed.
 const char kPrefInstallTime[] = "install_time";
 
+// A preference which saves the creation flags for extensions.
+const char kPrefCreationFlags[] = "creation_flags";
+
 // A preference that indicates whether the extension was installed from the
 // Chrome Web Store.
 const char kPrefFromWebStore[] = "from_webstore";
 
 // A preference that indicates whether the extension was installed from a
 // mock App created from a bookmark.
 const char kPrefFromBookmark[] = "from_bookmark";
 
 // A prefrence that indicates whethere the extension was installed as
 // default apps.
@@ skipping 1260 matching lines @@
   return GetExtensionPrefAsVector(kExtensionActionBox);
 }
 
 void ExtensionPrefs::SetActionBoxOrder(const ExtensionIdList& extension_ids) {
   SetExtensionPrefFromVector(kExtensionActionBox, extension_ids);
 }
 
 void ExtensionPrefs::OnExtensionInstalled(
     const Extension* extension,
     Extension::State initial_state,
     bool from_webstore,

[Mihai Parparita -not on Chrome, 2012/09/29 00:22:25]

This parameter should be equivalent to extension->creation_flags() &
FROM_WEBSTORE. It would be good to verify that it is, and if so, remove it.

[Gaurav, 2012/10/01 22:09:36]

Done.

     const syncer::StringOrdinal& page_ordinal) {
   const std::string& id = extension->id();
   CHECK(Extension::IdIsValid(id));
   ScopedExtensionPrefUpdate update(prefs_, id);
   DictionaryValue* extension_dict = update.Get();
   const base::Time install_time = GetCurrentTime();
   extension_dict->Set(kPrefState, Value::CreateIntegerValue(initial_state));
   extension_dict->Set(kPrefLocation,
                       Value::CreateIntegerValue(extension->location()));
+  extension_dict->Set(kPrefCreationFlags,
+                      Value::CreateIntegerValue(extension->creation_flags()));
   extension_dict->Set(kPrefFromWebStore,
                       Value::CreateBooleanValue(from_webstore));
   extension_dict->Set(kPrefFromBookmark,
                       Value::CreateBooleanValue(extension->from_bookmark()));
   extension_dict->Set(kPrefWasInstalledByDefault,
       Value::CreateBooleanValue(extension->was_installed_by_default()));
   extension_dict->Set(kPrefInstallTime,
                       Value::CreateStringValue(
                           base::Int64ToString(install_time.ToInternalValue())));
   extension_dict->Set(kPrefPreferences, new DictionaryValue());
@@ skipping 393 matching lines @@
 
 bool ExtensionPrefs::IsFromBookmark(
     const std::string& extension_id) const {
   const DictionaryValue* dictionary = GetExtensionPref(extension_id);
   bool result = false;
   if (dictionary && dictionary->GetBoolean(kPrefFromBookmark, &result))
     return result;
   return false;
 }
 
+int ExtensionPrefs::GetCreationFlags(const std::string& extension_id) const {
+  const DictionaryValue* dictionary = GetExtensionPref(extension_id);
+  int creation_flags = 0;

[Mihai Parparita -not on Chrome, 2012/09/29 00:22:25]

There's an Extension::NO_FLAGS  value that you can use instead.

[Gaurav, 2012/10/01 22:09:36]

Done.

+  if (dictionary) {
+    dictionary->GetInteger(kPrefCreationFlags, &creation_flags);

[Mihai Parparita -not on Chrome, 2012/09/29 00:22:25]

This can still fail (the extension preference dictionary is present, but it
doesn't have a kPrefCreationFlags key).

You should use ReadExtensionPrefInteger, and if that fails, fall back to
synthesizing the value from the old prefs.

[Gaurav, 2012/10/01 22:09:36]

Done.

+  } else {
+    // Since kPrefCreationFlags was added later, it will be missing for
+    // previously installed extensions.
+    creation_flags |= IsFromBookmark(extension_id);

[Mihai Parparita -not on Chrome, 2012/09/29 00:22:25]

This won't quite work. You're trying to say:
creation_flags |= Extension::FROM_BOOKMARK

but you're instead saying 
creation_flags |= true (or false)

The same is true for the all the other flags.

Something like:
if (IsFromBookmark(extension_id))
  creation_flags |= Extension::FROM_BOOKMARK;

Should work.

[Gaurav, 2012/09/29 00:30:28]

My mad, will fix this.

On 2012/09/29 00:22:25, Mihai Parparita wrote:

[Gaurav, 2012/10/01 22:09:36]

Done.

+    creation_flags |= IsFromWebStore(extension_id);
+    creation_flags |= WasInstalledByDefault(extension_id);
+  }
+  return creation_flags;
+}
+
 bool ExtensionPrefs::WasInstalledByDefault(
     const std::string& extension_id) const {
   const DictionaryValue* dictionary = GetExtensionPref(extension_id);
   bool result = false;
   if (dictionary &&
       dictionary->GetBoolean(kPrefWasInstalledByDefault, &result))
     return result;
   return false;
 }
 
@@ skipping 322 matching lines @@
     const ExtensionIdList& strings) {
   ListPrefUpdate update(prefs_, pref);
   ListValue* list_of_values = update.Get();
   list_of_values->Clear();
   for (ExtensionIdList::const_iterator iter = strings.begin();
        iter != strings.end(); ++iter)
     list_of_values->Append(new StringValue(*iter));
 }
 
 }  // namespace extensions