Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / media_galleries / media_galleries_preferences.cc

diff --git a/src/chrome/browser/media_galleries/media_galleries_preferences.cc b/src/chrome/browser/media_galleries/media_galleries_preferences.cc
index 32eaa29..ed5b223 100644 (file)
--- a/src/chrome/browser/media_galleries/media_galleries_preferences.cc
+++ b/src/chrome/browser/media_galleries/media_galleries_preferences.cc
@@ -26,6 +26,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/grit/generated_resources.h"
+#include "components/crx_file/id_util.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/storage_monitor/media_storage_util.h"
 #include "components/storage_monitor/storage_monitor.h"
@@ -33,12 +35,10 @@
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/pref_names.h"
-#include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/media_galleries_permission.h"
 #include "extensions/common/permissions/permissions_data.h"
-#include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::DictionaryValue;
@@ -1198,7 +1198,7 @@ bool MediaGalleriesPreferences::NonAutoGalleryHasPermission(
 
   for (base::DictionaryValue::Iterator iter(*extensions); !iter.IsAtEnd();
        iter.Advance()) {
-    if (!extensions::Extension::IdIsValid(iter.key())) {
+    if (!crx_file::id_util::IdIsValid(iter.key())) {
       NOTREACHED();
       continue;
     }
@@ -1439,7 +1439,7 @@ void MediaGalleriesPreferences::RemoveGalleryPermissionsFromPrefs(
 
   for (base::DictionaryValue::Iterator iter(*extensions); !iter.IsAtEnd();
        iter.Advance()) {
-    if (!extensions::Extension::IdIsValid(iter.key())) {
+    if (!crx_file::id_util::IdIsValid(iter.key())) {
       NOTREACHED();
       continue;
     }