From 381f55b3cb67258128fb38eb6a199886fb2a520d Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 12 Dec 2016 12:42:30 -0800
Subject: [PATCH] Remove unneeded empty checks

---
 atom/app/atom_content_client.cc       | 16 ++++++----------
 atom/renderer/atom_renderer_client.cc |  7 ++-----
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/atom/app/atom_content_client.cc b/atom/app/atom_content_client.cc
index a3d3ac8..30508a2 100644
--- a/atom/app/atom_content_client.cc
+++ b/atom/app/atom_content_client.cc
@@ -197,10 +197,9 @@ void AtomContentClient::AddServiceWorkerSchemes(
   std::vector<std::string> schemes;
   ConvertStringWithSeparatorToVector(&schemes, ",",
                                      switches::kRegisterServiceWorkerSchemes);
-  if (!schemes.empty()) {
-    for (const std::string& scheme : schemes)
-      service_worker_schemes->insert(scheme);
-  }
+  for (const std::string& scheme : schemes)
+    service_worker_schemes->insert(scheme);
+
   service_worker_schemes->insert(url::kFileScheme);
 }
 
@@ -209,12 +208,9 @@ void AtomContentClient::AddSecureSchemesAndOrigins(
     std::set<GURL>* secure_origins) {
   std::vector<std::string> schemes;
   ConvertStringWithSeparatorToVector(&schemes, ",",
-                                     switches::kSecureSchemes);                        
-  if (!schemes.empty()) {
-    for (const std::string& scheme : schemes) {
-      secure_schemes->insert(scheme);
-    }
-  }
+                                     switches::kSecureSchemes);
+  for (const std::string& scheme : schemes)
+    secure_schemes->insert(scheme);
 }
 
 
diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
index 963d639..1c873d9 100644
--- a/atom/renderer/atom_renderer_client.cc
+++ b/atom/renderer/atom_renderer_client.cc
@@ -124,10 +124,7 @@ bool IsDevToolsExtension(content::RenderFrame* render_frame) {
 std::vector<std::string> ParseSchemesCLISwitch(const char* switch_name) {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   std::string custom_schemes = command_line->GetSwitchValueASCII(switch_name);
-  if (!custom_schemes.empty()) {
-    return base::SplitString(custom_schemes, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
-  }
-  return std::vector<std::string>();
+  return base::SplitString(custom_schemes, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
 }
 
 }  // namespace
@@ -186,7 +183,7 @@ void AtomRendererClient::RenderFrameCreated(
   // Allow file scheme to handle service worker by default.
   // FIXME(zcbenz): Can this be moved elsewhere?
   blink::WebSecurityPolicy::registerURLSchemeAsAllowingServiceWorkers("file");
-  
+
   // Parse --secure-schemes=scheme1,scheme2
   std::vector<std::string> secure_schemes_list = ParseSchemesCLISwitch(switches::kSecureSchemes);
   for (const std::string& secure_scheme : secure_schemes_list) {
-- 
2.7.4