| Index: chrome/browser/sync_file_system/local/local_file_sync_service.cc
|
| diff --git a/chrome/browser/sync_file_system/local/local_file_sync_service.cc b/chrome/browser/sync_file_system/local/local_file_sync_service.cc
|
| index 002f83ba9b6c36c3ad1c6345f37c4643029a26d1..e7501e764db3eb167e67a780f30c849a5d4001bf 100644
|
| --- a/chrome/browser/sync_file_system/local/local_file_sync_service.cc
|
| +++ b/chrome/browser/sync_file_system/local/local_file_sync_service.cc
|
| @@ -5,7 +5,6 @@
|
| #include "chrome/browser/sync_file_system/local/local_file_sync_service.h"
|
|
|
| #include "base/stl_util.h"
|
| -#include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/extensions/extension_util.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/sync_file_system/file_change.h"
|
| @@ -19,7 +18,8 @@
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/site_instance.h"
|
| #include "content/public/browser/storage_partition.h"
|
| -#include "extensions/browser/extension_system.h"
|
| +#include "extensions/browser/extension_registry.h"
|
| +#include "extensions/common/extension_set.h"
|
| #include "url/gurl.h"
|
| #include "webkit/browser/fileapi/file_system_context.h"
|
| #include "webkit/browser/fileapi/file_system_url.h"
|
| @@ -207,10 +207,9 @@ void LocalFileSyncService::PrepareForProcessRemoteChange(
|
| // been initialized in this service.
|
| DCHECK(profile_);
|
| // The given url.origin() must be for valid installed app.
|
| - ExtensionService* extension_service =
|
| - extensions::ExtensionSystem::Get(profile_)->extension_service();
|
| - const extensions::Extension* extension = extension_service->GetInstalledApp(
|
| - url.origin());
|
| + const extensions::Extension* extension =
|
| + extensions::ExtensionRegistry::Get(profile_)
|
| + ->enabled_extensions().GetAppByURL(url.origin());
|
| if (!extension) {
|
| util::Log(
|
| logging::LOG_WARNING,
|
|
|