Fix syncing of NPAPI plugins.

chrome/common/extensions/sync_helper.cc

 // Copyright 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/common/extensions/sync_helper.h"
 
 #include "base/logging.h"
 #include "chrome/common/extensions/api/plugins/plugins_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
@@ skipping 23 matching lines @@
   // approve synced extensions.
   if (!ManifestURL::GetUpdateURL(extension).is_empty() &&
       !ManifestURL::UpdatesFromGallery(extension)) {
     return SYNC_TYPE_NONE;
   }
 
   // Disallow extensions with native code plugins.
   //
   // TODO(akalin): Relax this restriction once we've put in UI to
   // approve synced extensions.
-  if (PluginInfo::HasPlugins(extension))
+  if (PluginInfo::HasPlugins(extension) ||
+      extension->HasAPIPermission(APIPermission::kPlugin)) {
     return SYNC_TYPE_NONE;
+  }
 
   switch (extension->GetType()) {
     case Manifest::TYPE_EXTENSION:
       return SYNC_TYPE_EXTENSION;
 
     case Manifest::TYPE_USER_SCRIPT:
       // We only want to sync user scripts with gallery update URLs.
       if (ManifestURL::UpdatesFromGallery(extension))
         return SYNC_TYPE_EXTENSION;
       return SYNC_TYPE_NONE;
@@ skipping 33 matching lines @@
 bool IsSyncableExtension(const Extension* extension) {
   return GetSyncType(extension) == SYNC_TYPE_EXTENSION;
 }
 
 bool IsSyncableApp(const Extension* extension) {
   return GetSyncType(extension) == SYNC_TYPE_APP;
 }
 
 }  // namespace sync_helper
 }  // namespace extensions