| Index: content/shell/shell_browser_context.cc
|
| diff --git a/content/shell/shell_browser_context.cc b/content/shell/shell_browser_context.cc
|
| index 86ae1a444b455cc1ccf871265b54b705b658e2b1..b4644773a5534a4b32ba9419c090c12a5cffd584 100644
|
| --- a/content/shell/shell_browser_context.cc
|
| +++ b/content/shell/shell_browser_context.cc
|
| @@ -56,7 +56,7 @@ void ShellBrowserContext::InitWhileIOAllowed() {
|
| path_ = path_.Append(std::wstring(L"content_shell"));
|
| #elif defined(OS_LINUX)
|
| scoped_ptr<base::Environment> env(base::Environment::Create());
|
| - FilePath config_dir(
|
| + base::FilePath config_dir(
|
| base::nix::GetXDGDirectory(env.get(),
|
| base::nix::kXdgConfigHomeEnvVar,
|
| base::nix::kDotConfigDir));
|
| @@ -75,7 +75,7 @@ void ShellBrowserContext::InitWhileIOAllowed() {
|
| file_util::CreateDirectory(path_);
|
| }
|
|
|
| -FilePath ShellBrowserContext::GetPath() {
|
| +base::FilePath ShellBrowserContext::GetPath() {
|
| return path_;
|
| }
|
|
|
| @@ -129,14 +129,14 @@ net::URLRequestContextGetter*
|
|
|
| net::URLRequestContextGetter*
|
| ShellBrowserContext::GetMediaRequestContextForStoragePartition(
|
| - const FilePath& partition_path,
|
| + const base::FilePath& partition_path,
|
| bool in_memory) {
|
| return GetRequestContext();
|
| }
|
|
|
| net::URLRequestContextGetter*
|
| ShellBrowserContext::GetRequestContextForStoragePartition(
|
| - const FilePath& partition_path,
|
| + const base::FilePath& partition_path,
|
| bool in_memory) {
|
| return NULL;
|
| }
|
|
|