Skip to content

GitLab

T
tangled
Commit 24e8964b authored by rdevlin.cronin's avatar rdevlin.cronin Committed by Commit bot
Browse files
Options

[Extensions] Use base::StringPiece in ErrorUtils 

ErrorUtils are used to construct errors or warnings, and are usually
based on const char[]s. Change method signature to take a string piece
to avoid constructing a bunch of temporary std::strings.

BUG=None

Review-Url: https://codereview.chromium.org/2604033002
Cr-Commit-Position: refs/heads/master@{#440907}
parent 346b1c32
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 39 deletions
extensions/common/error_utils.cc
View file @ 24e8964b
......@@ -9,48 +9,48 @@
namespace extensions {
std::string ErrorUtils::FormatErrorMessage(const std::string& format,
const std::string& s1) {
std::string ret_val = format;
std::string ErrorUtils::FormatErrorMessage(base::StringPiece format,
base::StringPiece s1) {
std::string ret_val = format.as_string();
base::ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
return ret_val;
}
std::string ErrorUtils::FormatErrorMessage(const std::string& format,
const std::string& s1,
const std::string& s2) {
std::string ret_val = format;
std::string ErrorUtils::FormatErrorMessage(base::StringPiece format,
base::StringPiece s1,
base::StringPiece s2) {
std::string ret_val = format.as_string();
base::ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
base::ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s2);
return ret_val;
}
std::string ErrorUtils::FormatErrorMessage(const std::string& format,
const std::string& s1,
const std::string& s2,
const std::string& s3) {
std::string ret_val = format;
std::string ErrorUtils::FormatErrorMessage(base::StringPiece format,
base::StringPiece s1,
base::StringPiece s2,
base::StringPiece s3) {
std::string ret_val = format.as_string();
base::ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
base::ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s2);
base::ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s3);
return ret_val;
}
base::string16 ErrorUtils::FormatErrorMessageUTF16(const std::string& format,
const std::string& s1) {
base::string16 ErrorUtils::FormatErrorMessageUTF16(base::StringPiece format,
base::StringPiece s1) {
return base::UTF8ToUTF16(FormatErrorMessage(format, s1));
}
base::string16 ErrorUtils::FormatErrorMessageUTF16(const std::string& format,
const std::string& s1,
const std::string& s2) {
base::string16 ErrorUtils::FormatErrorMessageUTF16(base::StringPiece format,
base::StringPiece s1,
base::StringPiece s2) {
return base::UTF8ToUTF16(FormatErrorMessage(format, s1, s2));
}
base::string16 ErrorUtils::FormatErrorMessageUTF16(const std::string& format,
const std::string& s1,
const std::string& s2,
const std::string& s3) {
base::string16 ErrorUtils::FormatErrorMessageUTF16(base::StringPiece format,
base::StringPiece s1,
base::StringPiece s2,
base::StringPiece s3) {
return base::UTF8ToUTF16(FormatErrorMessage(format, s1, s2, s3));
}
......
extensions/common/error_utils.h
View file @ 24e8964b
......@@ -8,35 +8,36 @@
#include <string>
#include "base/strings/string16.h"
#include "base/strings/string_piece.h"
namespace extensions {
class ErrorUtils {
public:
// Creates an error messages from a pattern.
static std::string FormatErrorMessage(const std::string& format,
const std::string& s1);
static std::string FormatErrorMessage(base::StringPiece format,
base::StringPiece s1);
static std::string FormatErrorMessage(const std::string& format,
const std::string& s1,
const std::string& s2);
static std::string FormatErrorMessage(base::StringPiece format,
base::StringPiece s1,
base::StringPiece s2);
static std::string FormatErrorMessage(const std::string& format,
const std::string& s1,
const std::string& s2,
const std::string& s3);
static std::string FormatErrorMessage(base::StringPiece format,
base::StringPiece s1,
base::StringPiece s2,
base::StringPiece s3);
static base::string16 FormatErrorMessageUTF16(const std::string& format,
const std::string& s1);
static base::string16 FormatErrorMessageUTF16(base::StringPiece format,
base::StringPiece s1);
static base::string16 FormatErrorMessageUTF16(const std::string& format,
const std::string& s1,
const std::string& s2);
static base::string16 FormatErrorMessageUTF16(base::StringPiece format,
base::StringPiece s1,
base::StringPiece s2);
static base::string16 FormatErrorMessageUTF16(const std::string& format,
const std::string& s1,
const std::string& s2,
const std::string& s3);
static base::string16 FormatErrorMessageUTF16(base::StringPiece format,
base::StringPiece s1,
base::StringPiece s2,
base::StringPiece s3);
};
} // namespace extensions
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment