summaryrefslogtreecommitdiffstats
path: root/extensions/browser
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-24 00:28:56 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-24 00:28:56 +0000
commit553f2cfc3ea6ca92dabb6098ac77b39d66dc7751 (patch)
treee5c4aae9c8948f1d91de003ba0dc87d4f2817610 /extensions/browser
parenteb5b81b5f63240dfcf0bc27e861c6fc7fb1b24be (diff)
downloadchromium_src-553f2cfc3ea6ca92dabb6098ac77b39d66dc7751.zip
chromium_src-553f2cfc3ea6ca92dabb6098ac77b39d66dc7751.tar.gz
chromium_src-553f2cfc3ea6ca92dabb6098ac77b39d66dc7751.tar.bz2
Fix incorrect usage of base::EmptyString16().
Review URL: https://codereview.chromium.org/295223002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272654 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/browser')
-rw-r--r--extensions/browser/extension_error_test_util.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/browser/extension_error_test_util.cc b/extensions/browser/extension_error_test_util.cc
index cf4a4f0..68d905d 100644
--- a/extensions/browser/extension_error_test_util.cc
+++ b/extensions/browser/extension_error_test_util.cc
@@ -26,7 +26,7 @@ scoped_ptr<ExtensionError> CreateNewRuntimeError(
bool from_incognito) {
StackTrace stack_trace;
scoped_ptr<StackFrame> frame =
- StackFrame::CreateFromText(base::UTF8ToUTF16(kDefaultStackTrace));
+ StackFrame::CreateFromText(base::ASCIIToUTF16(kDefaultStackTrace));
CHECK(frame.get());
stack_trace.push_back(*frame);
@@ -57,8 +57,8 @@ scoped_ptr<ExtensionError> CreateNewManifestError(
return scoped_ptr<ExtensionError>(
new ManifestError(extension_id,
base::UTF8ToUTF16(message),
- base::EmptyString16(),
- base::EmptyString16()));
+ base::string16(),
+ base::string16()));
}
} // namespace error_test_util