| Index: chrome/browser/extensions/extension_service.cc
|
| diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
|
| index 068f4ecf6e3a5f0db836a872429635c5a50bcff6..559c848ebdd55c0e49c54cee752f6c0e3a15b13f 100644
|
| --- a/chrome/browser/extensions/extension_service.cc
|
| +++ b/chrome/browser/extensions/extension_service.cc
|
| @@ -57,7 +57,6 @@
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/crash_keys.h"
|
| #include "chrome/common/extensions/extension_constants.h"
|
| -#include "chrome/common/extensions/extension_file_util.h"
|
| #include "chrome/common/extensions/features/feature_channel.h"
|
| #include "chrome/common/extensions/manifest_url_handler.h"
|
| #include "chrome/common/pref_names.h"
|
| @@ -89,6 +88,7 @@
|
| #include "extensions/common/extension_messages.h"
|
| #include "extensions/common/extensions_client.h"
|
| #include "extensions/common/feature_switch.h"
|
| +#include "extensions/common/file_util.h"
|
| #include "extensions/common/manifest.h"
|
| #include "extensions/common/manifest_constants.h"
|
| #include "extensions/common/manifest_handlers/background_info.h"
|
| @@ -560,7 +560,7 @@ bool ExtensionService::UpdateExtension(const std::string& id,
|
| if (!GetFileTaskRunner()->PostTask(
|
| FROM_HERE,
|
| base::Bind(
|
| - &extension_file_util::DeleteFile, extension_path, false)))
|
| + &extensions::file_util::DeleteFile, extension_path, false)))
|
| NOTREACHED();
|
|
|
| return false;
|
| @@ -763,10 +763,9 @@ bool ExtensionService::UninstallExtension(
|
| if (!Manifest::IsUnpackedLocation(extension->location())) {
|
| if (!GetFileTaskRunner()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(
|
| - &extension_file_util::UninstallExtension,
|
| - install_directory_,
|
| - extension_id)))
|
| + base::Bind(&extensions::file_util::UninstallExtension,
|
| + install_directory_,
|
| + extension_id)))
|
| NOTREACHED();
|
| }
|
|
|
| @@ -1754,8 +1753,9 @@ void ExtensionService::OnExtensionInstalled(
|
| // load it.
|
| if (!GetFileTaskRunner()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&extension_file_util::DeleteFile,
|
| - extension->path(), true))) {
|
| + base::Bind(&extensions::file_util::DeleteFile,
|
| + extension->path(),
|
| + true))) {
|
| NOTREACHED();
|
| }
|
| return;
|
|
|