Cleanup: Remove std::string("") usage.

chrome/browser/chromeos/system/syslogs_provider.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/system/syslogs_provider.h"
 
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 33 matching lines @@
 const char kInvalidLogEntry[] = "<invalid characters in log entry>";
 const char kEmptyLogEntry[] = "<no value>";
 
 const char kContextFeedback[] = "feedback";
 const char kContextSysInfo[] = "sysinfo";
 const char kContextNetwork[] = "network";
 
 // Reads a key from the input string erasing the read values + delimiters read
 // from the initial string
 std::string ReadKey(std::string* data) {
+  std::string key;
   size_t equal_sign = data->find("=");
-  if (equal_sign == std::string::npos)
-    return std::string("");
-  std::string key = data->substr(0, equal_sign);
-  data->erase(0, equal_sign);
-  if (data->size() > 0) {
-    // erase the equal to sign also
-    data->erase(0,1);
-    return key;
+  if (equal_sign != std::string::npos) {
+    key = data->substr(0, equal_sign);
+    data->erase(0, equal_sign);
+    if (data->size() > 0) {
+      // erase the equal to sign also
+      data->erase(0, 1);
+    }
   }
-  return std::string();
+  return key;

[Nico, 2014/01/29 22:15:24]

Hate this change. Early returns FTW!

[Lei Zhang, 2014/01/29 22:20:16]

Ok, flipped it back a bit.

 }
 
 // Reads a value from the input string; erasing the read values from
 // the initial string; detects if the value is multiline and reads
 // accordingly
 std::string ReadValue(std::string* data) {
   // Trim the leading spaces and tabs. In order to use a multi-line
   // value, you have to place the multi-line quote on the same line as
   // the equal sign.
   //
@@ skipping 11 matching lines @@
     data->erase(0, strlen(kMultilineQuote));
     size_t next_multi = data->find(kMultilineQuote);
     if (next_multi == std::string::npos) {
       // Error condition, clear data to stop further processing
       data->erase();
       return std::string();
     }
     std::string value = data->substr(0, next_multi);
     data->erase(0, next_multi + 3);
     return value;
-  } else { // single line value
+  } else {
+    // single line value
     size_t endl_pos = data->find_first_of(kNewLineChars);
     // if we don't find a new line, we just return the rest of the data
     std::string value = data->substr(0, endl_pos);
     data->erase(0, endl_pos);
     return value;
   }
 }
 
 // Returns a map of system log keys and values.
 //
@@ skipping 290 matching lines @@
   return Singleton<SyslogsProviderImpl,
                    DefaultSingletonTraits<SyslogsProviderImpl> >::get();
 }
 
 SyslogsProvider* SyslogsProvider::GetInstance() {
   return SyslogsProviderImpl::GetInstance();
 }
 
 }  // namespace system
 }  // namespace chromeos