summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/appcache/appcache_update_job_unittest.cc14
-rw-r--r--webkit/fileapi/copy_or_move_file_validator_unittest.cc3
-rw-r--r--webkit/fileapi/external_mount_points_unittest.cc6
-rw-r--r--webkit/fileapi/file_system_directory_database_unittest.cc2
-rw-r--r--webkit/fileapi/file_system_origin_database.cc2
-rw-r--r--webkit/fileapi/file_system_util_unittest.cc2
-rw-r--r--webkit/fileapi/local_file_stream_writer_unittest.cc4
-rw-r--r--webkit/fileapi/local_file_system_cross_operation_unittest.cc6
-rw-r--r--webkit/fileapi/obfuscated_file_util_unittest.cc4
-rw-r--r--webkit/fileapi/syncable/canned_syncable_file_system.cc3
-rw-r--r--webkit/glue/webclipboard_impl.cc6
-rw-r--r--webkit/media/crypto/key_systems.cc5
-rw-r--r--webkit/media/crypto/key_systems_unittest.cc24
-rw-r--r--webkit/media/crypto/ppapi/cdm_wrapper.cc2
-rw-r--r--webkit/media/crypto/ppapi/clear_key_cdm.cc9
-rw-r--r--webkit/media/crypto/ppapi_decryptor.cc2
-rw-r--r--webkit/media/crypto/proxy_decryptor.cc3
-rw-r--r--webkit/plugins/ppapi/content_decryptor_delegate.cc9
-rw-r--r--webkit/quota/quota_manager_unittest.cc2
-rw-r--r--webkit/tools/test_shell/test_shell.h3
20 files changed, 61 insertions, 50 deletions
diff --git a/webkit/appcache/appcache_update_job_unittest.cc b/webkit/appcache/appcache_update_job_unittest.cc
index 86b3df6..b90e783 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("", "");
+ HttpHeadersRequestTestJob::Initialize(std::string(), std::string());
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("", "");
+ HttpHeadersRequestTestJob::Initialize(std::string(), std::string());
update = new AppCacheUpdateJob(service_.get(), group_);
group_->update_job_ = update;
group_->update_status_ = AppCacheGroup::DOWNLOADING;
@@ -2687,7 +2687,8 @@ class AppCacheUpdateJobTest : public testing::Test,
response_info = new net::HttpResponseInfo();
response_info->headers = headers2;
- HttpHeadersRequestTestJob::Initialize("Sat, 29 Oct 1994 19:43:31 GMT", "");
+ HttpHeadersRequestTestJob::Initialize("Sat, 29 Oct 1994 19:43:31 GMT",
+ std::string());
update = new AppCacheUpdateJob(service_.get(), group_);
group_->update_job_ = update;
group_->update_status_ = AppCacheGroup::DOWNLOADING;
@@ -2703,7 +2704,8 @@ 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", "");
+ HttpHeadersRequestTestJob::Initialize("Sat, 29 Oct 1994 19:43:31 GMT",
+ std::string());
net::URLRequestJobFactoryImpl* new_factory(
new net::URLRequestJobFactoryImpl);
new_factory->SetProtocolHandler("http", new IfModifiedSinceJobFactory);
@@ -2765,7 +2767,7 @@ class AppCacheUpdateJobTest : public testing::Test,
void IfNoneMatchUpgradeTest() {
ASSERT_EQ(MessageLoop::TYPE_IO, MessageLoop::current()->type());
- HttpHeadersRequestTestJob::Initialize("", "\"LadeDade\"");
+ HttpHeadersRequestTestJob::Initialize(std::string(), "\"LadeDade\"");
net::URLRequestJobFactoryImpl* new_factory(
new net::URLRequestJobFactoryImpl);
new_factory->SetProtocolHandler("http", new IfModifiedSinceJobFactory);
@@ -2827,7 +2829,7 @@ class AppCacheUpdateJobTest : public testing::Test,
void IfNoneMatchRefetchTest() {
ASSERT_EQ(MessageLoop::TYPE_IO, MessageLoop::current()->type());
- HttpHeadersRequestTestJob::Initialize("", "\"LadeDade\"");
+ HttpHeadersRequestTestJob::Initialize(std::string(), "\"LadeDade\"");
net::URLRequestJobFactoryImpl* new_factory(
new net::URLRequestJobFactoryImpl);
new_factory->SetProtocolHandler("http", new IfModifiedSinceJobFactory);
diff --git a/webkit/fileapi/copy_or_move_file_validator_unittest.cc b/webkit/fileapi/copy_or_move_file_validator_unittest.cc
index 7abc628..6aafa88 100644
--- a/webkit/fileapi/copy_or_move_file_validator_unittest.cc
+++ b/webkit/fileapi/copy_or_move_file_validator_unittest.cc
@@ -58,8 +58,7 @@ class CopyOrMoveFileValidatorTestHelper {
FileSystemMountPointProvider* mount_point_provider =
file_system_context_->GetMountPointProvider(src_type_);
mount_point_provider->GetFileSystemRootPathOnFileThread(
- SourceURL(""),
- true /* create */);
+ SourceURL(std::string()), true /* create */);
}
DCHECK_EQ(kFileSystemTypeNativeMedia, dest_type_);
base::FilePath dest_path = base_dir.Append(FILE_PATH_LITERAL("dest_media"));
diff --git a/webkit/fileapi/external_mount_points_unittest.cc b/webkit/fileapi/external_mount_points_unittest.cc
index 4b2ce6cb..8c012fa 100644
--- a/webkit/fileapi/external_mount_points_unittest.cc
+++ b/webkit/fileapi/external_mount_points_unittest.cc
@@ -154,7 +154,7 @@ TEST(ExternalMountPointsTest, GetVirtualPath) {
// A mount point with an empty path.
mount_points->RegisterFileSystem("empty_path",
fileapi::kFileSystemTypeNativeLocal,
- base::FilePath(FPL("")));
+ base::FilePath(FPL(std::string())));
struct TestCase {
const base::FilePath::CharType* const local_path;
@@ -271,7 +271,7 @@ TEST(ExternalMountPointsTest, CreateCrackedFileSystemURL) {
base::FilePath(DRIVE FPL("/a/b/c(1)")));
mount_points->RegisterFileSystem("empty_path",
fileapi::kFileSystemTypeSyncable,
- base::FilePath(FPL("")));
+ base::FilePath(FPL(std::string())));
mount_points->RegisterFileSystem("mount",
fileapi::kFileSystemTypeDrive,
base::FilePath(DRIVE FPL("/root")));
@@ -382,7 +382,7 @@ TEST(ExternalMountPointsTest, CrackVirtualPath) {
base::FilePath(DRIVE FPL("/a/b/c(1)")));
mount_points->RegisterFileSystem("empty_path",
fileapi::kFileSystemTypeSyncable,
- base::FilePath(FPL("")));
+ base::FilePath(FPL(std::string())));
mount_points->RegisterFileSystem("mount",
fileapi::kFileSystemTypeDrive,
base::FilePath(DRIVE FPL("/root")));
diff --git a/webkit/fileapi/file_system_directory_database_unittest.cc b/webkit/fileapi/file_system_directory_database_unittest.cc
index b612669..5a4b889 100644
--- a/webkit/fileapi/file_system_directory_database_unittest.cc
+++ b/webkit/fileapi/file_system_directory_database_unittest.cc
@@ -569,7 +569,7 @@ TEST_F(FileSystemDirectoryDatabaseTest, TestConsistencyCheck_OrphanFile) {
TEST_F(FileSystemDirectoryDatabaseTest, TestConsistencyCheck_RootLoop) {
EXPECT_TRUE(db()->IsFileSystemConsistent());
- MakeHierarchyLink(0, 0, FPL(""));
+ MakeHierarchyLink(0, 0, FPL(std::string()));
EXPECT_FALSE(db()->IsFileSystemConsistent());
}
diff --git a/webkit/fileapi/file_system_origin_database.cc b/webkit/fileapi/file_system_origin_database.cc
index 1026418..a7405d9 100644
--- a/webkit/fileapi/file_system_origin_database.cc
+++ b/webkit/fileapi/file_system_origin_database.cc
@@ -265,7 +265,7 @@ bool FileSystemOriginDatabase::ListAllOrigins(
return false;
DCHECK(origins);
scoped_ptr<leveldb::Iterator> iter(db_->NewIterator(leveldb::ReadOptions()));
- std::string origin_key_prefix = OriginToOriginKey("");
+ std::string origin_key_prefix = OriginToOriginKey(std::string());
iter->Seek(origin_key_prefix);
origins->clear();
while (iter->Valid() &&
diff --git a/webkit/fileapi/file_system_util_unittest.cc b/webkit/fileapi/file_system_util_unittest.cc
index 7c946cc..74fc764 100644
--- a/webkit/fileapi/file_system_util_unittest.cc
+++ b/webkit/fileapi/file_system_util_unittest.cc
@@ -115,7 +115,7 @@ TEST_F(FileSystemUtilTest, GetNormalizedFilePath) {
TEST_F(FileSystemUtilTest, IsAbsolutePath) {
EXPECT_TRUE(VirtualPath::IsAbsolute(FILE_PATH_LITERAL("/")));
EXPECT_TRUE(VirtualPath::IsAbsolute(FILE_PATH_LITERAL("/foo/bar")));
- EXPECT_FALSE(VirtualPath::IsAbsolute(FILE_PATH_LITERAL("")));
+ EXPECT_FALSE(VirtualPath::IsAbsolute(FILE_PATH_LITERAL(std::string())));
EXPECT_FALSE(VirtualPath::IsAbsolute(FILE_PATH_LITERAL("foo/bar")));
}
diff --git a/webkit/fileapi/local_file_stream_writer_unittest.cc b/webkit/fileapi/local_file_stream_writer_unittest.cc
index d67a7da..41c547e 100644
--- a/webkit/fileapi/local_file_stream_writer_unittest.cc
+++ b/webkit/fileapi/local_file_stream_writer_unittest.cc
@@ -77,7 +77,7 @@ void NeverCalled(int unused) {
} // namespace
TEST_F(LocalFileStreamWriterTest, Write) {
- base::FilePath path = CreateFileWithContent("file_a", "");
+ base::FilePath path = CreateFileWithContent("file_a", std::string());
scoped_ptr<LocalFileStreamWriter> writer(new LocalFileStreamWriter(path, 0));
EXPECT_EQ(net::OK, WriteStringToWriter(writer.get(), "foo"));
EXPECT_EQ(net::OK, WriteStringToWriter(writer.get(), "bar"));
@@ -126,7 +126,7 @@ TEST_F(LocalFileStreamWriterTest, CancelBeforeOperation) {
}
TEST_F(LocalFileStreamWriterTest, CancelAfterFinishedOperation) {
- base::FilePath path = CreateFileWithContent("file_a", "");
+ base::FilePath path = CreateFileWithContent("file_a", std::string());
scoped_ptr<LocalFileStreamWriter> writer(new LocalFileStreamWriter(path, 0));
EXPECT_EQ(net::OK, WriteStringToWriter(writer.get(), "foo"));
diff --git a/webkit/fileapi/local_file_system_cross_operation_unittest.cc b/webkit/fileapi/local_file_system_cross_operation_unittest.cc
index 2929b93..5466069 100644
--- a/webkit/fileapi/local_file_system_cross_operation_unittest.cc
+++ b/webkit/fileapi/local_file_system_cross_operation_unittest.cc
@@ -71,13 +71,11 @@ class CrossOperationTestHelper {
FileSystemMountPointProvider* mount_point_provider =
file_system_context_->GetMountPointProvider(src_type_);
mount_point_provider->GetFileSystemRootPathOnFileThread(
- SourceURL(""),
- true /* create */);
+ SourceURL(std::string()), true /* create */);
mount_point_provider =
file_system_context_->GetMountPointProvider(dest_type_);
mount_point_provider->GetFileSystemRootPathOnFileThread(
- DestURL(""),
- true /* create */);
+ DestURL(std::string()), true /* create */);
// Grant relatively big quota initially.
quota_manager_->SetQuota(origin_,
diff --git a/webkit/fileapi/obfuscated_file_util_unittest.cc b/webkit/fileapi/obfuscated_file_util_unittest.cc
index 387f28e..6a6d4a6 100644
--- a/webkit/fileapi/obfuscated_file_util_unittest.cc
+++ b/webkit/fileapi/obfuscated_file_util_unittest.cc
@@ -941,7 +941,7 @@ TEST_F(ObfuscatedFileUtilTest, TestDirectoryOps) {
EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND,
ofu()->DeleteDirectory(context.get(), url));
- FileSystemURL root = CreateURLFromUTF8("");
+ FileSystemURL root = CreateURLFromUTF8(std::string());
EXPECT_FALSE(DirectoryExists(url));
EXPECT_FALSE(PathExists(url));
context.reset(NewContext(NULL));
@@ -1081,7 +1081,7 @@ TEST_F(ObfuscatedFileUtilTest, TestReadDirectory) {
}
TEST_F(ObfuscatedFileUtilTest, TestReadRootWithSlash) {
- TestReadDirectoryHelper(CreateURLFromUTF8(""));
+ TestReadDirectoryHelper(CreateURLFromUTF8(std::string()));
}
TEST_F(ObfuscatedFileUtilTest, TestReadRootWithEmptyString) {
diff --git a/webkit/fileapi/syncable/canned_syncable_file_system.cc b/webkit/fileapi/syncable/canned_syncable_file_system.cc
index 954d6a5..f323a1a 100644
--- a/webkit/fileapi/syncable/canned_syncable_file_system.cc
+++ b/webkit/fileapi/syncable/canned_syncable_file_system.cc
@@ -445,7 +445,8 @@ void CannedSyncableFileSystem::ClearChangeForURLInTracker(
}
FileSystemOperation* CannedSyncableFileSystem::NewOperation() {
- return file_system_context_->CreateFileSystemOperation(URL(""), NULL);
+ return file_system_context_->CreateFileSystemOperation(URL(std::string()),
+ NULL);
}
void CannedSyncableFileSystem::OnSyncEnabled(const FileSystemURL& url) {
diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc
index 3cbe45c..302c81e 100644
--- a/webkit/glue/webclipboard_impl.cc
+++ b/webkit/glue/webclipboard_impl.cc
@@ -201,7 +201,7 @@ void WebClipboardImpl::writeURL(const WebURL& url, const WebString& title) {
ScopedClipboardWriterGlue scw(client_);
scw.WriteBookmark(title, url.spec());
- scw.WriteHTML(UTF8ToUTF16(URLToMarkup(url, title)), "");
+ scw.WriteHTML(UTF8ToUTF16(URLToMarkup(url, title)), std::string());
scw.WriteText(UTF8ToUTF16(std::string(url.spec())));
}
@@ -225,7 +225,7 @@ void WebClipboardImpl::writeImage(
// We also don't want to write HTML on a Mac, since Mail.app prefers to use
// the image markup over attaching the actual image. See
// http://crbug.com/33016 for details.
- scw.WriteHTML(UTF8ToUTF16(URLToImageMarkup(url, title)), "");
+ scw.WriteHTML(UTF8ToUTF16(URLToImageMarkup(url, title)), std::string());
#endif
}
}
@@ -238,7 +238,7 @@ void WebClipboardImpl::writeDataObject(const WebDragData& data) {
if (!data_object.text.is_null())
scw.WriteText(data_object.text.string());
if (!data_object.html.is_null())
- scw.WriteHTML(data_object.html.string(), "");
+ scw.WriteHTML(data_object.html.string(), std::string());
// If there is no custom data, avoid calling WritePickledData. This ensures
// that ScopedClipboardWriterGlue's dtor remains a no-op if the page didn't
// modify the DataTransfer object, which is important to avoid stomping on
diff --git a/webkit/media/crypto/key_systems.cc b/webkit/media/crypto/key_systems.cc
index b9c79d0..0ffe951 100644
--- a/webkit/media/crypto/key_systems.cc
+++ b/webkit/media/crypto/key_systems.cc
@@ -66,7 +66,7 @@ KeySystems::KeySystems() {
for (size_t j = 0; j < mime_type_codecs.size(); ++j)
codecs.insert(mime_type_codecs[j]);
// Support the MIME type string alone, without codec(s) specified.
- codecs.insert("");
+ codecs.insert(std::string());
// Key systems can be repeated, so there may already be an entry.
KeySystemMappings::iterator key_system_iter =
@@ -113,7 +113,8 @@ bool KeySystems::IsSupportedKeySystemWithMediaMimeType(
const std::vector<std::string>& codecs,
const std::string& key_system) {
if (codecs.empty())
- return IsSupportedKeySystemWithContainerAndCodec(mime_type, "", key_system);
+ return IsSupportedKeySystemWithContainerAndCodec(
+ mime_type, std::string(), key_system);
for (size_t i = 0; i < codecs.size(); ++i) {
if (!IsSupportedKeySystemWithContainerAndCodec(
diff --git a/webkit/media/crypto/key_systems_unittest.cc b/webkit/media/crypto/key_systems_unittest.cc
index 0c25196..4b28ec9 100644
--- a/webkit/media/crypto/key_systems_unittest.cc
+++ b/webkit/media/crypto/key_systems_unittest.cc
@@ -233,14 +233,14 @@ TEST_F(KeySystemsTest, ClearKey_IsSupportedKeySystem_InvalidVariants) {
TEST_F(KeySystemsTest, IsSupportedKeySystemWithMediaMimeType_ClearKey_NoType) {
// These two should be true. See http://crbug.com/164303.
EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
- "", no_codecs(), kClearKey));
+ std::string(), no_codecs(), kClearKey));
EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
- "", no_codecs(), "webkit-org.w3"));
+ std::string(), no_codecs(), "webkit-org.w3"));
EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
- "", no_codecs(), "webkit-org.w3.foo"));
+ std::string(), no_codecs(), "webkit-org.w3.foo"));
EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
- "", no_codecs(), "webkit-org.w3.clearkey.foo"));
+ std::string(), no_codecs(), "webkit-org.w3.clearkey.foo"));
}
TEST_F(KeySystemsTest, IsSupportedKeySystemWithMediaMimeType_ClearKey_WebM) {
@@ -419,14 +419,14 @@ TEST_F(KeySystemsTest,
IsSupportedKeySystemWithMediaMimeType_ExternalClearKey_NoType) {
// These two should be true. See http://crbug.com/164303.
EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
- "", no_codecs(), kExternalClearKey));
+ std::string(), no_codecs(), kExternalClearKey));
EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
- "", no_codecs(), "org.chromium"));
+ std::string(), no_codecs(), "org.chromium"));
EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
- "", no_codecs(), "org.chromium.foo"));
+ std::string(), no_codecs(), "org.chromium.foo"));
EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
- "", no_codecs(), "org.chromium.externalclearkey.foo"));
+ std::string(), no_codecs(), "org.chromium.externalclearkey.foo"));
}
TEST_F(KeySystemsTest,
@@ -606,14 +606,14 @@ TEST_F(KeySystemsTest, Widevine_IsSupportedKeySystem_InvalidVariants) {
TEST_F(KeySystemsTest, IsSupportedKeySystemWithMediaMimeType_Widevine_NoType) {
// These two should be true. See http://crbug.com/164303.
EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
- "", no_codecs(), kWidevineAlpha));
+ std::string(), no_codecs(), kWidevineAlpha));
EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
- "", no_codecs(), kWidevine));
+ std::string(), no_codecs(), kWidevine));
EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
- "", no_codecs(), "com.widevine.foo"));
+ std::string(), no_codecs(), "com.widevine.foo"));
EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
- "", no_codecs(), "com.widevine.alpha.foo"));
+ std::string(), no_codecs(), "com.widevine.alpha.foo"));
}
TEST_F(KeySystemsTest, IsSupportedKeySystemWithMediaMimeType_Widevine_WebM) {
diff --git a/webkit/media/crypto/ppapi/cdm_wrapper.cc b/webkit/media/crypto/ppapi/cdm_wrapper.cc
index 25eadb0..cd5b917 100644
--- a/webkit/media/crypto/ppapi/cdm_wrapper.cc
+++ b/webkit/media/crypto/ppapi/cdm_wrapper.cc
@@ -652,7 +652,7 @@ void CdmWrapper::GenerateKeyRequest(const std::string& key_system,
if (!cdm_) {
if (!CreateCdmInstance(key_system)) {
- SendUnknownKeyError(key_system, "");
+ SendUnknownKeyError(key_system, std::string());
return;
}
}
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/media/crypto/ppapi/clear_key_cdm.cc
index 4c0e2d5..faa6635 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.cc
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc
@@ -249,7 +249,11 @@ cdm::Status ClearKeyCdm::AddKey(const char* session_id,
DVLOG(1) << "AddKey()";
base::AutoLock auto_lock(client_lock_);
ScopedResetter<Client> auto_resetter(&client_);
- decryptor_.AddKey("", key, key_size, key_id, key_id_size,
+ decryptor_.AddKey(std::string(),
+ key,
+ key_size,
+ key_id,
+ key_id_size,
std::string(session_id, session_id_size));
if (client_.status() != Client::kKeyAdded)
@@ -268,7 +272,8 @@ cdm::Status ClearKeyCdm::CancelKeyRequest(const char* session_id,
DVLOG(1) << "CancelKeyRequest()";
base::AutoLock auto_lock(client_lock_);
ScopedResetter<Client> auto_resetter(&client_);
- decryptor_.CancelKeyRequest("", std::string(session_id, session_id_size));
+ decryptor_.CancelKeyRequest(std::string(),
+ std::string(session_id, session_id_size));
return cdm::kSuccess;
}
diff --git a/webkit/media/crypto/ppapi_decryptor.cc b/webkit/media/crypto/ppapi_decryptor.cc
index 580c5a3..7b9c334 100644
--- a/webkit/media/crypto/ppapi_decryptor.cc
+++ b/webkit/media/crypto/ppapi_decryptor.cc
@@ -68,7 +68,7 @@ bool PpapiDecryptor::GenerateKeyRequest(const std::string& key_system,
if (!plugin_cdm_delegate_->GenerateKeyRequest(
key_system, type, init_data, init_data_length)) {
- ReportFailureToCallPlugin(key_system, "");
+ ReportFailureToCallPlugin(key_system, std::string());
return false;
}
diff --git a/webkit/media/crypto/proxy_decryptor.cc b/webkit/media/crypto/proxy_decryptor.cc
index bd0328a..dafc955 100644
--- a/webkit/media/crypto/proxy_decryptor.cc
+++ b/webkit/media/crypto/proxy_decryptor.cc
@@ -117,7 +117,8 @@ bool ProxyDecryptor::GenerateKeyRequest(const std::string& key_system,
if (!decryptor_) {
decryptor_ = CreateDecryptor(key_system);
if (!decryptor_) {
- key_error_cb_.Run(key_system, "", media::Decryptor::kClientError, 0);
+ key_error_cb_.Run(
+ key_system, std::string(), media::Decryptor::kClientError, 0);
return false;
}
}
diff --git a/webkit/plugins/ppapi/content_decryptor_delegate.cc b/webkit/plugins/ppapi/content_decryptor_delegate.cc
index 8515531..5e3a649 100644
--- a/webkit/plugins/ppapi/content_decryptor_delegate.cc
+++ b/webkit/plugins/ppapi/content_decryptor_delegate.cc
@@ -627,7 +627,8 @@ void ContentDecryptorDelegate::KeyAdded(PP_Var key_system_var,
StringVar* key_system_string = StringVar::FromPPVar(key_system_var);
StringVar* session_id_string = StringVar::FromPPVar(session_id_var);
if (!key_system_string || !session_id_string) {
- key_error_cb_.Run("", "", media::Decryptor::kUnknownError, 0);
+ key_error_cb_.Run(
+ std::string(), std::string(), media::Decryptor::kUnknownError, 0);
return;
}
@@ -656,7 +657,8 @@ void ContentDecryptorDelegate::KeyMessage(PP_Var key_system_var,
StringVar* default_url_string = StringVar::FromPPVar(default_url_var);
if (!key_system_string || !session_id_string || !default_url_string) {
- key_error_cb_.Run("", "", media::Decryptor::kUnknownError, 0);
+ key_error_cb_.Run(
+ std::string(), std::string(), media::Decryptor::kUnknownError, 0);
return;
}
@@ -676,7 +678,8 @@ void ContentDecryptorDelegate::KeyError(PP_Var key_system_var,
StringVar* key_system_string = StringVar::FromPPVar(key_system_var);
StringVar* session_id_string = StringVar::FromPPVar(session_id_var);
if (!key_system_string || !session_id_string) {
- key_error_cb_.Run("", "", media::Decryptor::kUnknownError, 0);
+ key_error_cb_.Run(
+ std::string(), std::string(), media::Decryptor::kUnknownError, 0);
return;
}
diff --git a/webkit/quota/quota_manager_unittest.cc b/webkit/quota/quota_manager_unittest.cc
index ccbc826..c814dbc 100644
--- a/webkit/quota/quota_manager_unittest.cc
+++ b/webkit/quota/quota_manager_unittest.cc
@@ -1368,7 +1368,7 @@ TEST_F(QuotaManagerTest, DeleteHostDataSimple) {
MessageLoop::current()->RunUntilIdle();
int64 predelete_host_pers = usage();
- DeleteHostData("", kTemp, kAllClients);
+ DeleteHostData(std::string(), kTemp, kAllClients);
MessageLoop::current()->RunUntilIdle();
EXPECT_EQ(kQuotaStatusOk, status());
diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h
index 5b85305..2640224 100644
--- a/webkit/tools/test_shell/test_shell.h
+++ b/webkit/tools/test_shell/test_shell.h
@@ -243,7 +243,8 @@ public:
// Get the JavaScript flags for a specific load
static std::string GetJSFlagsForLoad(size_t load) {
- if (load >= js_flags_.size()) return "";
+ if (load >= js_flags_.size())
+ return std::string();
return js_flags_[load];
}
generated by cgit v1.1 at 2025-01-31 22:29:50 +0000