Don't disable packaged / hosted Apps on profile_reset

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 2013 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_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <set>
 
@@ skipping 959 matching lines @@
     extensions_.Remove(extension->id());
     NotifyExtensionUnloaded(extension, extension_misc::UNLOAD_REASON_DISABLE);
   } else {
     terminated_extensions_.Remove(extension->id());
   }
 
   SyncExtensionChangeIfNeeded(*extension);
 }
 
 void ExtensionService::DisableUserExtensions(
+    const std::set<extensions::Manifest::Type> type_filter,
     const std::vector<std::string>& except_ids) {
   extensions::ManagementPolicy* management_policy =
       system_->management_policy();
   extensions::ExtensionList to_disable;
 
   for (ExtensionSet::const_iterator extension = extensions_.begin();
       extension != extensions_.end(); ++extension) {
     if (management_policy->UserMayModifySettings(extension->get(), NULL))
       to_disable.push_back(*extension);
   }
   for (ExtensionSet::const_iterator extension = terminated_extensions_.begin();
       extension != terminated_extensions_.end(); ++extension) {
     if (management_policy->UserMayModifySettings(extension->get(), NULL))
       to_disable.push_back(*extension);
   }
 
   for (extensions::ExtensionList::const_iterator extension = to_disable.begin();
       extension != to_disable.end(); ++extension) {
+    if (!(*extension)->manifest() ||

[vasilii, 2013/08/02 09:32:04]

I don't think it's possible.

[battre, 2013/08/02 10:36:21]

Me neither, but I don't want to merge a crasher into the beta branch. However,
the ->GetType() method gives me enough confidence. --> Done.

+        type_filter.end() == type_filter.find((*extension)->manifest()->type()))

[vasilii, 2013/08/02 09:32:04]

(*extension)->GetType()?

[battre, 2013/08/02 10:36:21]

Done.

+      continue;
     const std::string& id = (*extension)->id();
     if (except_ids.end() == std::find(except_ids.begin(), except_ids.end(), id))
       DisableExtension(id, extensions::Extension::DISABLE_USER_ACTION);
   }
 }
 
 void ExtensionService::GrantPermissionsAndEnableExtension(
     const Extension* extension) {
   GrantPermissions(extension);
   RecordPermissionMessagesHistogram(
@@ skipping 2103 matching lines @@
 }
 
 void ExtensionService::AddUpdateObserver(extensions::UpdateObserver* observer) {
   update_observers_.AddObserver(observer);
 }
 
 void ExtensionService::RemoveUpdateObserver(
     extensions::UpdateObserver* observer) {
   update_observers_.RemoveObserver(observer);
 }