diff options
author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 06:41:12 +0000 |
---|---|---|
committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 06:41:12 +0000 |
commit | 69d7f89d6a93e0fbce451960287066195c6d4ea0 (patch) | |
tree | 51c8c1f971d39d652ec38ed76070539bb33e85c7 /webkit/appcache | |
parent | e3748a79b523a8d365d4a33ef986eebb4186fa78 (diff) | |
download | chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.zip chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.tar.gz chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.tar.bz2 |
Revert "Rewrite std::string("") to std::string(), Linux edition."
This reverts commit e59558b78e8c6a1b0bd916a724724b638c3c91b6.
Revert "Fix build after r193020."
This reverts commit 558a35897f6b3ffbcaefde927c1f150b815d140a.
Revert "Really fix build after r193020."
This reverts commit e3748a79b523a8d365d4a33ef986eebb4186fa78.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache')
-rw-r--r-- | webkit/appcache/appcache_update_job_unittest.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/webkit/appcache/appcache_update_job_unittest.cc b/webkit/appcache/appcache_update_job_unittest.cc index b90e783..86b3df6 100644 --- a/webkit/appcache/appcache_update_job_unittest.cc +++ b/webkit/appcache/appcache_update_job_unittest.cc @@ -2649,7 +2649,7 @@ class AppCacheUpdateJobTest : public testing::Test, // First test against a cache attempt. Will start manifest fetch // synchronously. - HttpHeadersRequestTestJob::Initialize(std::string(), std::string()); + HttpHeadersRequestTestJob::Initialize("", ""); MockFrontend mock_frontend; AppCacheHost host(1, &mock_frontend, service_.get()); update->StartUpdate(&host, GURL()); @@ -2666,7 +2666,7 @@ class AppCacheUpdateJobTest : public testing::Test, net::HttpResponseInfo* response_info = new net::HttpResponseInfo(); response_info->headers = headers; // adds ref to headers - HttpHeadersRequestTestJob::Initialize(std::string(), std::string()); + HttpHeadersRequestTestJob::Initialize("", ""); update = new AppCacheUpdateJob(service_.get(), group_); group_->update_job_ = update; group_->update_status_ = AppCacheGroup::DOWNLOADING; @@ -2687,8 +2687,7 @@ class AppCacheUpdateJobTest : public testing::Test, response_info = new net::HttpResponseInfo(); response_info->headers = headers2; - HttpHeadersRequestTestJob::Initialize("Sat, 29 Oct 1994 19:43:31 GMT", - std::string()); + HttpHeadersRequestTestJob::Initialize("Sat, 29 Oct 1994 19:43:31 GMT", ""); update = new AppCacheUpdateJob(service_.get(), group_); group_->update_job_ = update; group_->update_status_ = AppCacheGroup::DOWNLOADING; @@ -2704,8 +2703,7 @@ class AppCacheUpdateJobTest : public testing::Test, void IfModifiedSinceUpgradeTest() { ASSERT_EQ(MessageLoop::TYPE_IO, MessageLoop::current()->type()); - HttpHeadersRequestTestJob::Initialize("Sat, 29 Oct 1994 19:43:31 GMT", - std::string()); + HttpHeadersRequestTestJob::Initialize("Sat, 29 Oct 1994 19:43:31 GMT", ""); net::URLRequestJobFactoryImpl* new_factory( new net::URLRequestJobFactoryImpl); new_factory->SetProtocolHandler("http", new IfModifiedSinceJobFactory); @@ -2767,7 +2765,7 @@ class AppCacheUpdateJobTest : public testing::Test, void IfNoneMatchUpgradeTest() { ASSERT_EQ(MessageLoop::TYPE_IO, MessageLoop::current()->type()); - HttpHeadersRequestTestJob::Initialize(std::string(), "\"LadeDade\""); + HttpHeadersRequestTestJob::Initialize("", "\"LadeDade\""); net::URLRequestJobFactoryImpl* new_factory( new net::URLRequestJobFactoryImpl); new_factory->SetProtocolHandler("http", new IfModifiedSinceJobFactory); @@ -2829,7 +2827,7 @@ class AppCacheUpdateJobTest : public testing::Test, void IfNoneMatchRefetchTest() { ASSERT_EQ(MessageLoop::TYPE_IO, MessageLoop::current()->type()); - HttpHeadersRequestTestJob::Initialize(std::string(), "\"LadeDade\""); + HttpHeadersRequestTestJob::Initialize("", "\"LadeDade\""); net::URLRequestJobFactoryImpl* new_factory( new net::URLRequestJobFactoryImpl); new_factory->SetProtocolHandler("http", new IfModifiedSinceJobFactory); |