Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(972)

Unified Diff: extensions/common/file_util_unittest.cc

Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/common/file_util_unittest.cc
diff --git a/extensions/common/file_util_unittest.cc b/extensions/common/file_util_unittest.cc
index 01a1672f5aeab86ad7aa5f2aa0e7a939e636f0b5..9a5fa0e1b485fe2a5c7d8fac1ad5eae6b1579b3e 100644
--- a/extensions/common/file_util_unittest.cc
+++ b/extensions/common/file_util_unittest.cc
@@ -44,9 +44,9 @@ scoped_refptr<Extension> LoadExtensionManifest(
int extra_flags,
std::string* error) {
JSONStringValueSerializer serializer(manifest_value);
- scoped_ptr<base::Value> result(serializer.Deserialize(NULL, error));
+ scoped_ptr<base::Value> result(serializer.Deserialize(nullptr, error));
if (!result.get())
- return NULL;
+ return nullptr;
CHECK_EQ(base::Value::TYPE_DICTIONARY, result->GetType());
return LoadExtensionManifest(
static_cast<base::DictionaryValue*>(result.get()),
@@ -122,7 +122,7 @@ TEST_F(FileUtilTest, LoadExtensionWithValidLocales) {
std::string error;
scoped_refptr<Extension> extension(file_util::LoadExtension(
install_dir, Manifest::UNPACKED, Extension::NO_FLAGS, &error));
- ASSERT_TRUE(extension.get() != NULL);
+ ASSERT_TRUE(extension.get() != nullptr);
EXPECT_EQ("The first extension that I made.", extension->description());
}
@@ -134,7 +134,7 @@ TEST_F(FileUtilTest, LoadExtensionWithoutLocalesFolder) {
std::string error;
scoped_refptr<Extension> extension(file_util::LoadExtension(
install_dir, Manifest::UNPACKED, Extension::NO_FLAGS, &error));
- ASSERT_FALSE(extension.get() == NULL);
+ ASSERT_FALSE(extension.get() == nullptr);
EXPECT_TRUE(error.empty());
}
@@ -191,7 +191,7 @@ TEST_F(FileUtilTest, LoadExtensionGivesHelpfullErrorOnMissingManifest) {
std::string error;
scoped_refptr<Extension> extension(file_util::LoadExtension(
install_dir, Manifest::UNPACKED, Extension::NO_FLAGS, &error));
- ASSERT_TRUE(extension.get() == NULL);
+ ASSERT_TRUE(extension.get() == nullptr);
ASSERT_FALSE(error.empty());
ASSERT_STREQ("Manifest file is missing or unreadable.", error.c_str());
}
@@ -205,7 +205,7 @@ TEST_F(FileUtilTest, LoadExtensionGivesHelpfullErrorOnBadManifest) {
std::string error;
scoped_refptr<Extension> extension(file_util::LoadExtension(
install_dir, Manifest::UNPACKED, Extension::NO_FLAGS, &error));
- ASSERT_TRUE(extension.get() == NULL);
+ ASSERT_TRUE(extension.get() == nullptr);
ASSERT_FALSE(error.empty());
ASSERT_STREQ(
"Manifest is not valid JSON. "
@@ -389,7 +389,7 @@ TEST_F(FileUtilTest, CheckZeroLengthIconFile) {
std::string error;
scoped_refptr<Extension> extension(file_util::LoadExtension(
ext_dir, Manifest::UNPACKED, Extension::NO_FLAGS, &error));
- EXPECT_TRUE(extension.get() == NULL);
+ EXPECT_TRUE(extension.get() == nullptr);
EXPECT_STREQ("Could not load extension icon 'icon.png'.", error.c_str());
}
@@ -462,28 +462,20 @@ TEST_F(FileUtilTest, ExtensionResourceURLToFilePath) {
const char* url;
const base::FilePath::CharType* expected_path;
} test_cases[] = {
- { URL_PREFIX "apiname/test.js",
- FILE_PATH_LITERAL("test.js") },
- { URL_PREFIX "/apiname/test.js",
- FILE_PATH_LITERAL("test.js") },
- // Test % escape
- { URL_PREFIX "apiname/%74%65st.js",
- FILE_PATH_LITERAL("test.js") },
- { URL_PREFIX "apiname/escape%20spaces.js",
- FILE_PATH_LITERAL("escape spaces.js") },
- // Test file does not exist.
- { URL_PREFIX "apiname/directory/to/file.js",
- NULL },
- // Test apiname/../../test.js
- { URL_PREFIX "apiname/../../test.js",
- FILE_PATH_LITERAL("test.js") },
- { URL_PREFIX "apiname/..%2F../test.js",
- NULL },
- { URL_PREFIX "apiname/f/../../../test.js",
- FILE_PATH_LITERAL("test.js") },
- { URL_PREFIX "apiname/f%2F..%2F..%2F../test.js",
- NULL },
- };
+ {URL_PREFIX "apiname/test.js", FILE_PATH_LITERAL("test.js")},
+ {URL_PREFIX "/apiname/test.js", FILE_PATH_LITERAL("test.js")},
+ // Test % escape
+ {URL_PREFIX "apiname/%74%65st.js", FILE_PATH_LITERAL("test.js")},
+ {URL_PREFIX "apiname/escape%20spaces.js",
+ FILE_PATH_LITERAL("escape spaces.js")},
+ // Test file does not exist.
+ {URL_PREFIX "apiname/directory/to/file.js", nullptr},
+ // Test apiname/../../test.js
+ {URL_PREFIX "apiname/../../test.js", FILE_PATH_LITERAL("test.js")},
+ {URL_PREFIX "apiname/..%2F../test.js", nullptr},
+ {URL_PREFIX "apiname/f/../../../test.js", FILE_PATH_LITERAL("test.js")},
+ {URL_PREFIX "apiname/f%2F..%2F..%2F../test.js", nullptr},
+ };
#undef SEP
#undef URL_PREFIX

Powered by Google App Engine
This is Rietveld 408576698