Index: apps/saved_files_service.cc |
diff --git a/apps/saved_files_service.cc b/apps/saved_files_service.cc |
index 9d61e8d38bd9b49202a20cdeb22b456eea48b329..a11642be8f99a664a421df34676aea2ca964f381 100644 |
--- a/apps/saved_files_service.cc |
+++ b/apps/saved_files_service.cc |
@@ -15,7 +15,7 @@ |
#include "base/memory/ptr_util.h" |
#include "base/value_conversions.h" |
#include "chrome/browser/chrome_notification_types.h" |
-#include "chrome/browser/profiles/profile.h" |
+#include "content/public/browser/browser_context.h" |
#include "content/public/browser/notification_service.h" |
#include "extensions/browser/extension_host.h" |
#include "extensions/browser/extension_prefs.h" |
@@ -158,7 +158,7 @@ SavedFileEntry::SavedFileEntry(const std::string& id, |
class SavedFilesService::SavedFiles { |
public: |
- SavedFiles(Profile* profile, const std::string& extension_id); |
+ SavedFiles(content::BrowserContext* context, const std::string& extension_id); |
~SavedFiles(); |
void RegisterFileEntry(const std::string& id, |
@@ -177,7 +177,7 @@ class SavedFilesService::SavedFiles { |
void LoadSavedFileEntriesFromPreferences(); |
- Profile* profile_; |
+ content::BrowserContext* context_; |
const std::string extension_id_; |
// Contains all file entries that have been registered, keyed by ID. |
@@ -193,11 +193,12 @@ class SavedFilesService::SavedFiles { |
}; |
// static |
-SavedFilesService* SavedFilesService::Get(Profile* profile) { |
- return SavedFilesServiceFactory::GetForProfile(profile); |
+SavedFilesService* SavedFilesService::Get(content::BrowserContext* context) { |
+ return SavedFilesServiceFactory::GetForBrowserContext(context); |
} |
-SavedFilesService::SavedFilesService(Profile* profile) : profile_(profile) { |
+SavedFilesService::SavedFilesService(content::BrowserContext* context) |
+ : context_(context) { |
registrar_.Add(this, |
extensions::NOTIFICATION_EXTENSION_HOST_DESTROYED, |
content::NotificationService::AllSources()); |
@@ -248,7 +249,7 @@ std::vector<SavedFileEntry> SavedFilesService::GetAllFileEntries( |
SavedFiles* saved_files = Get(extension_id); |
if (saved_files) |
return saved_files->GetAllFileEntries(); |
- return GetSavedFileEntries(ExtensionPrefs::Get(profile_), extension_id); |
+ return GetSavedFileEntries(ExtensionPrefs::Get(context_), extension_id); |
} |
bool SavedFilesService::IsRegistered(const std::string& extension_id, |
@@ -271,7 +272,7 @@ void SavedFilesService::ClearQueueIfNoRetainPermission( |
} |
void SavedFilesService::ClearQueue(const extensions::Extension* extension) { |
- ClearSavedFileEntries(ExtensionPrefs::Get(profile_), extension->id()); |
+ ClearSavedFileEntries(ExtensionPrefs::Get(context_), extension->id()); |
Clear(extension->id()); |
} |
@@ -291,7 +292,7 @@ SavedFilesService::SavedFiles* SavedFilesService::GetOrInsert( |
return saved_files; |
std::unique_ptr<SavedFiles> scoped_saved_files( |
- new SavedFiles(profile_, extension_id)); |
+ new SavedFiles(context_, extension_id)); |
saved_files = scoped_saved_files.get(); |
extension_id_to_saved_files_.insert( |
std::make_pair(extension_id, std::move(scoped_saved_files))); |
@@ -302,9 +303,9 @@ void SavedFilesService::Clear(const std::string& extension_id) { |
extension_id_to_saved_files_.erase(extension_id); |
} |
-SavedFilesService::SavedFiles::SavedFiles(Profile* profile, |
+SavedFilesService::SavedFiles::SavedFiles(content::BrowserContext* context, |
const std::string& extension_id) |
- : profile_(profile), extension_id_(extension_id) { |
+ : context_(context), extension_id_(extension_id) { |
LoadSavedFileEntriesFromPreferences(); |
} |
@@ -342,7 +343,7 @@ void SavedFilesService::SavedFiles::EnqueueFileEntry(const std::string& id) { |
} |
saved_file_lru_.insert( |
std::make_pair(file_entry->sequence_number, file_entry)); |
- ExtensionPrefs* prefs = ExtensionPrefs::Get(profile_); |
+ ExtensionPrefs* prefs = ExtensionPrefs::Get(context_); |
if (old_sequence_number) { |
saved_file_lru_.erase(old_sequence_number); |
UpdateSavedFileEntry(prefs, extension_id_, *file_entry); |
@@ -397,7 +398,7 @@ void SavedFilesService::SavedFiles::MaybeCompactSequenceNumbers() { |
return; |
int sequence_number = 0; |
- ExtensionPrefs* prefs = ExtensionPrefs::Get(profile_); |
+ ExtensionPrefs* prefs = ExtensionPrefs::Get(context_); |
for (std::map<int, SavedFileEntry*>::iterator it = saved_file_lru_.begin(); |
it != saved_file_lru_.end(); |
++it) { |
@@ -418,7 +419,7 @@ void SavedFilesService::SavedFiles::MaybeCompactSequenceNumbers() { |
} |
void SavedFilesService::SavedFiles::LoadSavedFileEntriesFromPreferences() { |
- ExtensionPrefs* prefs = ExtensionPrefs::Get(profile_); |
+ ExtensionPrefs* prefs = ExtensionPrefs::Get(context_); |
std::vector<SavedFileEntry> saved_entries = |
GetSavedFileEntries(prefs, extension_id_); |
for (std::vector<SavedFileEntry>::iterator it = saved_entries.begin(); |