| Index: content/shell/browser/shell_message_filter.cc
|
| diff --git a/content/shell/browser/shell_message_filter.cc b/content/shell/browser/shell_message_filter.cc
|
| index fa21034c10fe40af72be0e8c21ab84644deabcc3..1c46fba429b339d0a0257f18e7868ee30df372a7 100644
|
| --- a/content/shell/browser/shell_message_filter.cc
|
| +++ b/content/shell/browser/shell_message_filter.cc
|
| @@ -16,9 +16,9 @@
|
| #include "net/cookies/cookie_monster.h"
|
| #include "net/url_request/url_request_context.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
| -#include "webkit/browser/database/database_tracker.h"
|
| -#include "webkit/browser/fileapi/isolated_context.h"
|
| -#include "webkit/browser/quota/quota_manager.h"
|
| +#include "storage/browser/database/database_tracker.h"
|
| +#include "storage/browser/fileapi/isolated_context.h"
|
| +#include "storage/browser/quota/quota_manager.h"
|
|
|
| namespace content {
|
|
|
| @@ -74,7 +74,7 @@ void ShellMessageFilter::OnReadFileToString(const base::FilePath& local_file,
|
| void ShellMessageFilter::OnRegisterIsolatedFileSystem(
|
| const std::vector<base::FilePath>& absolute_filenames,
|
| std::string* filesystem_id) {
|
| - fileapi::IsolatedContext::FileInfoSet files;
|
| + storage::IsolatedContext::FileInfoSet files;
|
| ChildProcessSecurityPolicy* policy =
|
| ChildProcessSecurityPolicy::GetInstance();
|
| for (size_t i = 0; i < absolute_filenames.size(); ++i) {
|
| @@ -83,7 +83,7 @@ void ShellMessageFilter::OnRegisterIsolatedFileSystem(
|
| policy->GrantReadFile(render_process_id_, absolute_filenames[i]);
|
| }
|
| *filesystem_id =
|
| - fileapi::IsolatedContext::GetInstance()->RegisterDraggedFileSystem(files);
|
| + storage::IsolatedContext::GetInstance()->RegisterDraggedFileSystem(files);
|
| policy->GrantReadFileSystem(render_process_id_, *filesystem_id);
|
| }
|
|
|
|
|