diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-27 03:57:31 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-27 03:57:31 +0000 |
| commit | dfde60177515cb12177cfd49c697b92c1a7a8572 (patch) | |
| tree | b8c3185503240223be50d8bbf706f700c6b21b02 /content/shell | |
| parent | f777cf18be3fd8fbd0fece7eb2c1f4f301d5767d (diff) | |
| download | chromium_src-dfde60177515cb12177cfd49c697b92c1a7a8572.zip chromium_src-dfde60177515cb12177cfd49c697b92c1a7a8572.tar.gz chromium_src-dfde60177515cb12177cfd49c697b92c1a7a8572.tar.bz2 | |
Cleanup: Fix bad uses of EmptyString() in content/ and chrome/.
Review URL: https://codereview.chromium.org/83343004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/browser/shell_download_manager_delegate.cc | 2 | ||||
| -rw-r--r-- | content/shell/browser/shell_url_request_context_getter.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/content/shell/browser/shell_download_manager_delegate.cc b/content/shell/browser/shell_download_manager_delegate.cc index 1dbbea7..0ce03eb 100644 --- a/content/shell/browser/shell_download_manager_delegate.cc +++ b/content/shell/browser/shell_download_manager_delegate.cc @@ -72,7 +72,7 @@ bool ShellDownloadManagerDelegate::DetermineDownloadTarget( base::FilePath generated_name = net::GenerateFileName( download->GetURL(), download->GetContentDisposition(), - EmptyString(), + std::string(), download->GetSuggestedFilename(), download->GetMimeType(), "download"); diff --git a/content/shell/browser/shell_url_request_context_getter.cc b/content/shell/browser/shell_url_request_context_getter.cc index dfdb852..27f0c4e 100644 --- a/content/shell/browser/shell_url_request_context_getter.cc +++ b/content/shell/browser/shell_url_request_context_getter.cc @@ -106,7 +106,7 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() { new net::DefaultServerBoundCertStore(NULL), base::WorkerPool::GetTaskRunner(true))); storage_->set_http_user_agent_settings( - new net::StaticHttpUserAgentSettings("en-us,en", EmptyString())); + new net::StaticHttpUserAgentSettings("en-us,en", std::string())); scoped_ptr<net::HostResolver> host_resolver( net::HostResolver::CreateDefaultResolver( |