Commit 41d24aff authored by Devlin Cronin's avatar Devlin Cronin Committed by Commit Bot

[Extensions] Update ExtensionService references in c/b/sync_file_system

Update references to ExtensionService in c/b/sync_file_system to use
extensions::ExtensionService.

There should be no behavior change as a result of this CL.

Bug: 117261
Change-Id: I43576ba459914801c64fac2e3834f079f8b62eb5
Reviewed-on: https://chromium-review.googlesource.com/1080008Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#563105}
parent bacfaa6b
......@@ -209,7 +209,7 @@ std::unique_ptr<SyncEngine> SyncEngine::CreateForBrowserContext(
Profile* profile = Profile::FromBrowserContext(context);
drive::DriveNotificationManager* notification_manager =
drive::DriveNotificationManagerFactory::GetForBrowserContext(context);
ExtensionService* extension_service =
extensions::ExtensionService* extension_service =
extensions::ExtensionSystem::Get(context)->extension_service();
SigninManagerBase* signin_manager =
SigninManagerFactory::GetForProfile(profile);
......@@ -336,7 +336,8 @@ void SyncEngine::InitializeInternal(
worker_observer_.reset(new WorkerObserver(ui_task_runner_.get(),
weak_ptr_factory_.GetWeakPtr()));
base::WeakPtr<ExtensionServiceInterface> extension_service_weak_ptr;
base::WeakPtr<extensions::ExtensionServiceInterface>
extension_service_weak_ptr;
if (extension_service_)
extension_service_weak_ptr = extension_service_->AsWeakPtr();
......@@ -720,7 +721,7 @@ SyncEngine::SyncEngine(
const base::FilePath& sync_file_system_dir,
TaskLogger* task_logger,
drive::DriveNotificationManager* notification_manager,
ExtensionServiceInterface* extension_service,
extensions::ExtensionServiceInterface* extension_service,
SigninManagerBase* signin_manager,
OAuth2TokenService* token_service,
net::URLRequestContextGetter* request_context,
......
......@@ -45,7 +45,8 @@ void InvokeIdleCallback(const base::Closure& idle_callback,
SyncWorker::SyncWorker(
const base::FilePath& base_dir,
const base::WeakPtr<ExtensionServiceInterface>& extension_service,
const base::WeakPtr<extensions::ExtensionServiceInterface>&
extension_service,
leveldb::Env* env_override)
: base_dir_(base_dir),
env_override_(env_override),
......@@ -411,11 +412,13 @@ void SyncWorker::UpdateRegisteredApps() {
}
void SyncWorker::QueryAppStatusOnUIThread(
const base::WeakPtr<ExtensionServiceInterface>& extension_service_ptr,
const base::WeakPtr<extensions::ExtensionServiceInterface>&
extension_service_ptr,
const std::vector<std::string>* app_ids,
AppStatusMap* status,
const base::Closure& callback) {
ExtensionServiceInterface* extension_service = extension_service_ptr.get();
extensions::ExtensionServiceInterface* extension_service =
extension_service_ptr.get();
if (!extension_service) {
callback.Run();
return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment