diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-02 05:29:53 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-02 05:29:53 +0000 |
| commit | 8790210c68de5ab29e54a46f761a7a8d60430334 (patch) | |
| tree | 159098319252d715c174230adbeb88338a6f67e4 /chrome_frame | |
| parent | 05fd507a71a552edc3290adc35c45dfdc13d251a (diff) | |
| download | chromium_src-8790210c68de5ab29e54a46f761a7a8d60430334.zip chromium_src-8790210c68de5ab29e54a46f761a7a8d60430334.tar.gz chromium_src-8790210c68de5ab29e54a46f761a7a8d60430334.tar.bz2 | |
Move EmptyString, kWhitespace and the BOM to base.
This moves EmptyString*, kWhitespace*, and the UTF 8 Byte Order Marker to the base:: namespace.
Many of them just got changed to a default-constructed string when a reference was not required.
I qualified some string16s with base:: when I was changing adjacent code. I need to do another pass to finish these up.
BUG=
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/89243003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_active_document.cc | 5 | ||||
| -rw-r--r-- | chrome_frame/test/automation_client_mock.h | 2 | ||||
| -rw-r--r-- | chrome_frame/test/test_with_web_server.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index 6c16f13..03b2e31 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -252,7 +252,7 @@ STDMETHODIMP ChromeActiveDocument::Load(BOOL fully_avalable, return E_INVALIDARG; } - std::string referrer(mgr ? mgr->referrer() : EmptyString()); + std::string referrer(mgr ? mgr->referrer() : std::string()); RendererType renderer_type = cf_url.is_chrome_protocol() ? RENDERER_TYPE_CHROME_GCF_PROTOCOL : RENDERER_TYPE_UNDETERMINED; @@ -399,8 +399,7 @@ STDMETHODIMP ChromeActiveDocument::LoadHistory(IStream* stream, return E_INVALIDARG; } - const std::string& referrer = EmptyString(); - if (!LaunchUrl(cf_url, referrer)) { + if (!LaunchUrl(cf_url, std::string())) { NOTREACHED() << __FUNCTION__ << " Failed to launch url:" << url; return E_INVALIDARG; } diff --git a/chrome_frame/test/automation_client_mock.h b/chrome_frame/test/automation_client_mock.h index cbbbc5a..ccb84d7 100644 --- a/chrome_frame/test/automation_client_mock.h +++ b/chrome_frame/test/automation_client_mock.h @@ -67,7 +67,7 @@ struct MockCFDelegate : public ChromeFrameDelegateImpl { void ReplyStarted(int request_id, const char* headers) { request_delegate_->OnResponseStarted(request_id, "text/html", headers, - 0, base::Time::Now(), EmptyString(), 0, net::HostPortPair(), 0); + 0, base::Time::Now(), std::string(), 0, net::HostPortPair(), 0); } void ReplyData(int request_id, const std::string* data) { diff --git a/chrome_frame/test/test_with_web_server.h b/chrome_frame/test/test_with_web_server.h index d900e73..8d41755 100644 --- a/chrome_frame/test/test_with_web_server.h +++ b/chrome_frame/test/test_with_web_server.h @@ -61,7 +61,7 @@ class WebServerListener { // MockWebServer mock(9999, "0.0.0.0"); // EXPECT_CALL(mock, Get(_, StrEq("/favicon.ico"), _)).WillRepeatedly(SendFast( // "HTTP/1.1 404 Not Found" -// "text/html; charset=UTF-8", EmptyString())); +// "text/html; charset=UTF-8", std::string())); // // EXPECT_CALL(mock, Get(_, StrEq("/book"), _)).WillRepeatedly(Send( // "HTTP/1.1 302 Found\r\n" |