diff options
25 files changed, 41 insertions, 44 deletions
diff --git a/base/test/expectations/expectation.cc b/base/test/expectations/expectation.cc index 9b06e28..3081779 100644 --- a/base/test/expectations/expectation.cc +++ b/base/test/expectations/expectation.cc @@ -38,7 +38,7 @@ static bool IsValidPlatform(const Platform* platform) { const std::string& variant = platform->variant; if (name == "Win") { - if (variant != "" && + if (!variant.empty() && variant != "XP" && variant != "Vista" && variant != "7" && @@ -46,7 +46,7 @@ static bool IsValidPlatform(const Platform* platform) { return false; } } else if (name == "Mac") { - if (variant != "" && + if (!variant.empty() && variant != "10.6" && variant != "10.7" && variant != "10.8" && @@ -55,7 +55,7 @@ static bool IsValidPlatform(const Platform* platform) { return false; } } else if (name == "Linux") { - if (variant != "" && + if (!variant.empty() && variant != "32" && variant != "64") { return false; diff --git a/base/test/test_file_util_win.cc b/base/test/test_file_util_win.cc index fd22a63..af8bd76 100644 --- a/base/test/test_file_util_win.cc +++ b/base/test/test_file_util_win.cc @@ -249,7 +249,7 @@ bool HasInternetZoneIdentifier(const FilePath& full_path) { switch (lines.size()) { case 3: // optional empty line at end of file: - if (lines[2] != "") + if (!lines[2].empty()) return false; // fall through: case 2: diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc index 8d10195..a0c21cd 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc @@ -234,7 +234,7 @@ class WallpaperManagerPolicyTest const std::string user_id = kTestUsers[user_number]; policy::UserPolicyBuilder* builder = user_policy_builders_[user_number].get(); - if (filename != "") { + if (!filename.empty()) { builder->payload(). mutable_wallpaperimage()->set_value(ConstructPolicy(filename)); } else { diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc index a340802..2426d31 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc @@ -617,7 +617,7 @@ bool BookmarkManagerPrivateGetSubtreeFunction::RunOnReady() { const BookmarkNode* node = NULL; - if (params->id == "") { + if (params->id.empty()) { BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile()); node = model->root_node(); } else { diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc index c353e5a..70ac235 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc @@ -1076,7 +1076,7 @@ bool DeveloperPrivateLoadDirectoryFunction::RunAsync() { ->GetFileSystemContext(); // Directory url is non empty only for syncfilesystem. - if (directory_url_str != "") { + if (!directory_url_str.empty()) { storage::FileSystemURL directory_url = context_->CrackURL(GURL(directory_url_str)); if (!directory_url.is_valid() || diff --git a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.cc b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.cc index df13814..88b17b000 100644 --- a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.cc +++ b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.cc @@ -57,7 +57,7 @@ void WriteFromUrlOperation::GetDownloadTarget( return; } - if (url_.ExtractFileName() == "") { + if (url_.ExtractFileName().empty()) { if (!base::CreateTemporaryFileInDir(temp_dir_.path(), &image_path_)) { Error(error::kTempFileError); return; diff --git a/chrome/browser/notifications/message_center_notifications_browsertest.cc b/chrome/browser/notifications/message_center_notifications_browsertest.cc index fed6d18..52f9949 100644 --- a/chrome/browser/notifications/message_center_notifications_browsertest.cc +++ b/chrome/browser/notifications/message_center_notifications_browsertest.cc @@ -33,14 +33,14 @@ class TestAddObserver : public message_center::MessageCenterObserver { void OnNotificationAdded(const std::string& id) override { std::string log = logs_[id]; - if (log != "") + if (!log.empty()) log += "_"; logs_[id] = log + "add-" + id; } void OnNotificationUpdated(const std::string& id) override { std::string log = logs_[id]; - if (log != "") + if (!log.empty()) log += "_"; logs_[id] = log + "update-" + id; } @@ -75,7 +75,7 @@ class MessageCenterNotificationsTest : public InProcessBrowserTest { void Display() override { log_ += "Display_"; } void Close(bool by_user) override { log_ += "Close_"; - log_ += ( by_user ? "by_user_" : "programmatically_"); + log_ += (by_user ? "by_user_" : "programmatically_"); } void Click() override { log_ += "Click_"; } void ButtonClick(int button_index) override { diff --git a/chrome/browser/prerender/prerender_local_predictor.cc b/chrome/browser/prerender/prerender_local_predictor.cc index e3fc999..8c8130a 100644 --- a/chrome/browser/prerender/prerender_local_predictor.cc +++ b/chrome/browser/prerender/prerender_local_predictor.cc @@ -292,7 +292,7 @@ bool IsExtendedRootURL(const GURL& url) { } bool IsRootPageURL(const GURL& url) { - return (url.path() == "/" || url.path() == "" || IsExtendedRootURL(url)) && + return (url.path() == "/" || url.path().empty() || IsExtendedRootURL(url)) && (!url.has_query()) && (!url.has_ref()); } diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc index 7c90a49..b49d807 100644 --- a/chrome/browser/profiles/profile_impl_io_data.cc +++ b/chrome/browser/profiles/profile_impl_io_data.cc @@ -74,7 +74,7 @@ net::BackendType ChooseCacheBackendType() { command_line.GetSwitchValueASCII(switches::kUseSimpleCacheBackend); if (LowerCaseEqualsASCII(opt_value, "off")) return net::CACHE_BACKEND_BLOCKFILE; - if (opt_value == "" || LowerCaseEqualsASCII(opt_value, "on")) + if (opt_value.empty() || LowerCaseEqualsASCII(opt_value, "on")) return net::CACHE_BACKEND_SIMPLE; } const std::string experiment_name = diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index a7b366f..7d1874c 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -121,12 +121,8 @@ #include "chrome/browser/ui/browser_window.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager_client.h" -#include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_namespace.h" -#include "components/policy/core/common/policy_service.h" #include "components/user_manager/user.h" #include "components/user_manager/user_manager.h" -#include "policy/policy_constants.h" #include "ui/chromeos/accessibility_types.h" #include "ui/gfx/image/image_skia.h" #endif // defined(OS_CHROMEOS) @@ -1708,7 +1704,7 @@ void BrowserOptionsHandler::HandleRequestHotwordAvailable( } std::string group = base::FieldTrialList::FindFullName("VoiceTrigger"); - if (group != "" && group != "Disabled" && + if (!group.empty() && group != "Disabled" && HotwordServiceFactory::IsHotwordAllowed(profile)) { // Update the current error value. HotwordServiceFactory::IsServiceAvailable(profile); diff --git a/chrome/common/extensions/sync_type_unittest.cc b/chrome/common/extensions/sync_type_unittest.cc index d457e09..a6343d7 100644 --- a/chrome/common/extensions/sync_type_unittest.cc +++ b/chrome/common/extensions/sync_type_unittest.cc @@ -70,7 +70,7 @@ class ExtensionSyncTypeTest : public testing::Test { std::string error; scoped_refptr<Extension> extension = Extension::Create( extension_path, location, source, creation_flags, &error); - if (expected_error == "") + if (expected_error.empty()) EXPECT_TRUE(extension.get()); else EXPECT_FALSE(extension.get()); diff --git a/components/enhanced_bookmarks/enhanced_bookmark_model.cc b/components/enhanced_bookmarks/enhanced_bookmark_model.cc index 77ee726..4b4b590 100644 --- a/components/enhanced_bookmarks/enhanced_bookmark_model.cc +++ b/components/enhanced_bookmarks/enhanced_bookmark_model.cc @@ -199,7 +199,7 @@ bool EnhancedBookmarkModel::SetOriginalImage(const BookmarkNode* node, image::collections::ImageData data; // Try to populate the imageData with the existing data. - if (decoded != "") { + if (!decoded.empty()) { // If the parsing fails, something is wrong. Immediately fail. bool result = data.ParseFromString(decoded); if (!result) @@ -229,7 +229,7 @@ bool EnhancedBookmarkModel::GetOriginalImage(const BookmarkNode* node, int* width, int* height) { std::string decoded(DataForMetaInfoField(node, kImageDataKey)); - if (decoded == "") + if (decoded.empty()) return false; image::collections::ImageData data; @@ -248,7 +248,7 @@ bool EnhancedBookmarkModel::GetThumbnailImage(const BookmarkNode* node, int* width, int* height) { std::string decoded(DataForMetaInfoField(node, kImageDataKey)); - if (decoded == "") + if (decoded.empty()) return false; image::collections::ImageData data; @@ -503,7 +503,7 @@ bool EnhancedBookmarkModel::SetAllImages(const BookmarkNode* node, image::collections::ImageData data; // Try to populate the imageData with the existing data. - if (decoded != "") { + if (!decoded.empty()) { // If the parsing fails, something is wrong. Immediately fail. bool result = data.ParseFromString(decoded); if (!result) diff --git a/components/enhanced_bookmarks/metadata_accessor.cc b/components/enhanced_bookmarks/metadata_accessor.cc index e2013b9..fc74885 100644 --- a/components/enhanced_bookmarks/metadata_accessor.cc +++ b/components/enhanced_bookmarks/metadata_accessor.cc @@ -119,7 +119,7 @@ bool SetOriginalImageForBookmark(BookmarkModel* bookmark_model, ImageData data; // Try to populate the imageData with the existing data. - if (decoded != "") { + if (!decoded.empty()) { // If the parsing fails, something is wrong. Immediately fail. bool result = data.ParseFromString(decoded); if (!result) @@ -150,7 +150,7 @@ bool OriginalImageFromBookmark(const BookmarkNode* node, int* width, int* height) { std::string decoded(DataForMetaInfoField(node, kImageDataKey)); - if (decoded == "") + if (decoded.empty()) return false; ImageData data; @@ -169,7 +169,7 @@ bool ThumbnailImageFromBookmark(const BookmarkNode* node, int* width, int* height) { std::string decoded(DataForMetaInfoField(node, kImageDataKey)); - if (decoded == "") + if (decoded.empty()) return false; ImageData data; @@ -185,7 +185,7 @@ bool ThumbnailImageFromBookmark(const BookmarkNode* node, std::string SnippetFromBookmark(const BookmarkNode* node) { std::string decoded(DataForMetaInfoField(node, kPageDataKey)); - if (decoded == "") + if (decoded.empty()) return decoded; PageData data; @@ -210,7 +210,7 @@ bool SetAllImagesForBookmark(BookmarkModel* bookmark_model, ImageData data; // Try to populate the imageData with the existing data. - if (decoded != "") { + if (!decoded.empty()) { // If the parsing fails, something is wrong. Immediately fail. bool result = data.ParseFromString(decoded); if (!result) diff --git a/content/browser/accessibility/browser_accessibility_android.cc b/content/browser/accessibility/browser_accessibility_android.cc index 3480d1f..9073c16 100644 --- a/content/browser/accessibility/browser_accessibility_android.cc +++ b/content/browser/accessibility/browser_accessibility_android.cc @@ -248,7 +248,7 @@ bool BrowserAccessibilityAndroid::CanOpenPopup() const { const char* BrowserAccessibilityAndroid::GetClassName() const { const char* class_name = NULL; - switch(GetRole()) { + switch (GetRole()) { case ui::AX_ROLE_SPIN_BUTTON: case ui::AX_ROLE_TEXT_AREA: case ui::AX_ROLE_TEXT_FIELD: @@ -435,7 +435,7 @@ base::string16 BrowserAccessibilityAndroid::GetText() const { int BrowserAccessibilityAndroid::GetItemIndex() const { int index = 0; - switch(GetRole()) { + switch (GetRole()) { case ui::AX_ROLE_LIST_ITEM: case ui::AX_ROLE_LIST_BOX_OPTION: case ui::AX_ROLE_TREE_ITEM: @@ -458,7 +458,7 @@ int BrowserAccessibilityAndroid::GetItemIndex() const { int BrowserAccessibilityAndroid::GetItemCount() const { int count = 0; - switch(GetRole()) { + switch (GetRole()) { case ui::AX_ROLE_LIST: case ui::AX_ROLE_LIST_BOX: case ui::AX_ROLE_DESCRIPTION_LIST: @@ -575,7 +575,7 @@ int BrowserAccessibilityAndroid::AndroidInputType() const { if (!GetHtmlAttribute("type", &type)) return ANDROID_TEXT_INPUTTYPE_TYPE_TEXT; - if (type == "" || type == "text" || type == "search") + if (type.empty() || type == "text" || type == "search") return ANDROID_TEXT_INPUTTYPE_TYPE_TEXT; else if (type == "date") return ANDROID_TEXT_INPUTTYPE_TYPE_DATETIME_DATE; diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc index 5bd8887..4313668 100644 --- a/content/browser/devtools/devtools_http_handler_impl.cc +++ b/content/browser/devtools/devtools_http_handler_impl.cc @@ -576,7 +576,7 @@ void ServerWrapper::OnHttpRequest(int connection_id, return; } - if (info.path == "" || info.path == "/") { + if (info.path.empty() || info.path == "/") { // Discovery page request. BrowserThread::PostTask( BrowserThread::UI, diff --git a/content/browser/renderer_host/input/input_router_config_helper.cc b/content/browser/renderer_host/input/input_router_config_helper.cc index 3fa3e58..57ad49e 100644 --- a/content/browser/renderer_host/input/input_router_config_helper.cc +++ b/content/browser/renderer_host/input/input_router_config_helper.cc @@ -105,7 +105,7 @@ TouchEventQueue::TouchScrollingMode GetTouchScrollingMode() { return TouchEventQueue::TOUCH_SCROLLING_MODE_SYNC_TOUCHMOVE; if (modeString == switches::kTouchScrollingModeTouchcancel) return TouchEventQueue::TOUCH_SCROLLING_MODE_TOUCHCANCEL; - if (modeString != "") + if (!modeString.empty()) LOG(ERROR) << "Invalid --touch-scrolling-mode option: " << modeString; return TouchEventQueue::TOUCH_SCROLLING_MODE_DEFAULT; } diff --git a/extensions/browser/api/system_storage/system_storage_api.cc b/extensions/browser/api/system_storage/system_storage_api.cc index 6b871b5..778498e 100644 --- a/extensions/browser/api/system_storage/system_storage_api.cc +++ b/extensions/browser/api/system_storage/system_storage_api.cc @@ -59,7 +59,7 @@ void SystemStorageEjectDeviceFunction::OnStorageMonitorInit( StorageMonitor::GetInstance()->GetDeviceIdForTransientId( transient_device_id); - if (device_id_str == "") { + if (device_id_str.empty()) { HandleResponse(StorageMonitor::EJECT_NO_SUCH_DEVICE); return; } diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc index ba6fd29..3b3c190 100644 --- a/google_apis/gaia/gaia_auth_fetcher.cc +++ b/google_apis/gaia/gaia_auth_fetcher.cc @@ -217,7 +217,7 @@ net::URLFetcher* GaiaAuthFetcher::CreateGaiaFetcher( net::URLFetcherDelegate* delegate) { net::URLFetcher* to_return = net::URLFetcher::Create( 0, gaia_gurl, - body == "" ? net::URLFetcher::GET : net::URLFetcher::POST, + body.empty() ? net::URLFetcher::GET : net::URLFetcher::POST, delegate); to_return->SetRequestContext(getter); to_return->SetUploadData("application/x-www-form-urlencoded", body); diff --git a/gpu/tools/compositor_model_bench/compositor_model_bench.cc b/gpu/tools/compositor_model_bench/compositor_model_bench.cc index 8042392..1160ff7 100644 --- a/gpu/tools/compositor_model_bench/compositor_model_bench.cc +++ b/gpu/tools/compositor_model_bench/compositor_model_bench.cc @@ -86,7 +86,7 @@ class Simulator { // If the name of the file wasn't ASCII, this will give an empty simulation // name, but that's not really harmful (we'll still warn about it though.) spec.simulation_name = path.BaseName().RemoveExtension().MaybeAsASCII(); - if (spec.simulation_name == "") { + if (spec.simulation_name.empty()) { LOG(WARNING) << "Simulation for path " << path.LossyDisplayName() << " will have a blank simulation name, since the file name isn't ASCII"; } diff --git a/media/midi/midi_manager_alsa.cc b/media/midi/midi_manager_alsa.cc index 492573b..37cbbebb 100644 --- a/media/midi/midi_manager_alsa.cc +++ b/media/midi/midi_manager_alsa.cc @@ -231,7 +231,7 @@ void MidiManagerAlsa::StartInitialization() { addr->port, name.c_str()); std::string version; - if (driver != "") { + if (!driver.empty()) { version = driver + " / "; } version += base::StringPrintf("ALSA library version %d.%d.%d", diff --git a/native_client_sdk/src/libraries/nacl_io/html5fs/html5_fs.cc b/native_client_sdk/src/libraries/nacl_io/html5fs/html5_fs.cc index 055a88a..f744750 100644 --- a/native_client_sdk/src/libraries/nacl_io/html5fs/html5_fs.cc +++ b/native_client_sdk/src/libraries/nacl_io/html5fs/html5_fs.cc @@ -256,7 +256,7 @@ Error Html5Fs::Init(const FsInitArgs& args) { filesystem_type = PP_FILESYSTEMTYPE_LOCALPERSISTENT; } else if (iter->second == "TEMPORARY") { filesystem_type = PP_FILESYSTEMTYPE_LOCALTEMPORARY; - } else if (iter->second == "") { + } else if (iter->second.empty()) { filesystem_type = PP_FILESYSTEMTYPE_LOCALPERSISTENT; } else { LOG_ERROR("Unknown filesystem type: '%s'", iter->second.c_str()); diff --git a/net/dns/dns_config_service_unittest.cc b/net/dns/dns_config_service_unittest.cc index 45a803d..e3abafd 100644 --- a/net/dns/dns_config_service_unittest.cc +++ b/net/dns/dns_config_service_unittest.cc @@ -41,7 +41,7 @@ class NameServerClassifierTest : public testing::Test { for (std::vector<std::string>::const_iterator it = server_strings.begin(); it != server_strings.end(); ++it) { - if (*it == "") + if (it->empty()) continue; IPAddressNumber address; diff --git a/ppapi/tests/test_compositor.cc b/ppapi/tests/test_compositor.cc index ba2b5ed..df1aad4f 100644 --- a/ppapi/tests/test_compositor.cc +++ b/ppapi/tests/test_compositor.cc @@ -34,7 +34,7 @@ REGISTER_TEST_CASE(Compositor); #define VERIFY(r) do { \ std::string result = (r); \ - if (result != "") \ + if (!result.empty()) \ return result; \ } while (false) diff --git a/ppapi/tests/test_var.cc b/ppapi/tests/test_var.cc index 714008a..f7de608 100644 --- a/ppapi/tests/test_var.cc +++ b/ppapi/tests/test_var.cc @@ -140,7 +140,7 @@ std::string TestVar::TestNullInputInUtf8Conversion() { // Should not crash, and make an empty string. const char* null_string = NULL; pp::Var null_var(null_string); - if (!null_var.is_string() || null_var.AsString() != "") { + if (!null_var.is_string() || !null_var.AsString().empty()) { return "Expected NULL input to make an empty string Var."; } diff --git a/ppapi/tests/test_var_deprecated.cc b/ppapi/tests/test_var_deprecated.cc index ee79868..d82cba1 100644 --- a/ppapi/tests/test_var_deprecated.cc +++ b/ppapi/tests/test_var_deprecated.cc @@ -26,7 +26,8 @@ static const char kSetValueFunction[] = "SetValue"; // ScriptableObject used by the var tests. class VarScriptableObject : public pp::deprecated::ScriptableObject { public: - VarScriptableObject(TestVarDeprecated* v) : test_var_deprecated_(v) {} + explicit VarScriptableObject(TestVarDeprecated* v) + : test_var_deprecated_(v) {} // pp::deprecated::ScriptableObject overrides. bool HasMethod(const pp::Var& name, pp::Var* exception); @@ -183,7 +184,7 @@ std::string TestVarDeprecated::TestNullInputInUtf8Conversion() { // Should not crash, and make an empty string. const char* null_string = NULL; pp::Var null_var(null_string); - if (!null_var.is_string() || null_var.AsString() != "") { + if (!null_var.is_string() || !null_var.AsString().empty()) { return "Expected NULL input to make an empty string Var."; } |