summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/convert_user_script_unittest.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-09 20:09:09 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-09 20:09:09 +0000
commit439f1e3d98de0a2021d71c8bb48773663c337b5a (patch)
treef5dd7f1e2423c670b1d4a1fa580671034352539d /chrome/browser/extensions/convert_user_script_unittest.cc
parent86478002f66eed132835788ad860300a5d222076 (diff)
downloadchromium_src-439f1e3d98de0a2021d71c8bb48773663c337b5a.zip
chromium_src-439f1e3d98de0a2021d71c8bb48773663c337b5a.tar.gz
chromium_src-439f1e3d98de0a2021d71c8bb48773663c337b5a.tar.bz2
Convert string16 to use base namespace.
TBR=sky Review URL: https://codereview.chromium.org/109233002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/convert_user_script_unittest.cc')
-rw-r--r--chrome/browser/extensions/convert_user_script_unittest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/extensions/convert_user_script_unittest.cc b/chrome/browser/extensions/convert_user_script_unittest.cc
index d0e5e95..e0e8ac7 100644
--- a/chrome/browser/extensions/convert_user_script_unittest.cc
+++ b/chrome/browser/extensions/convert_user_script_unittest.cc
@@ -41,7 +41,7 @@ TEST_F(ExtensionFromUserScript, Basic) {
test_file = test_file.AppendASCII("extensions")
.AppendASCII("user_script_basic.user.js");
- string16 error;
+ base::string16 error;
scoped_refptr<Extension> extension(ConvertUserScriptToExtension(
test_file, GURL("http://www.google.com/foo"),
extensions_dir.path(), &error));
@@ -94,7 +94,7 @@ TEST_F(ExtensionFromUserScript, NoMetadata) {
test_file = test_file.AppendASCII("extensions")
.AppendASCII("user_script_no_metadata.user.js");
- string16 error;
+ base::string16 error;
scoped_refptr<Extension> extension(ConvertUserScriptToExtension(
test_file, GURL("http://www.google.com/foo/bar.user.js?monkey"),
extensions_dir.path(), &error));
@@ -143,7 +143,7 @@ TEST_F(ExtensionFromUserScript, NotUTF8) {
test_file = test_file.AppendASCII("extensions")
.AppendASCII("user_script_not_utf8.user.js");
- string16 error;
+ base::string16 error;
scoped_refptr<Extension> extension(ConvertUserScriptToExtension(
test_file, GURL("http://www.google.com/foo/bar.user.js?monkey"),
extensions_dir.path(), &error));
@@ -161,7 +161,7 @@ TEST_F(ExtensionFromUserScript, RunAtDocumentStart) {
test_file = test_file.AppendASCII("extensions")
.AppendASCII("user_script_run_at_start.user.js");
- string16 error;
+ base::string16 error;
scoped_refptr<Extension> extension(ConvertUserScriptToExtension(
test_file, GURL("http://www.google.com/foo"),
extensions_dir.path(), &error));
@@ -196,7 +196,7 @@ TEST_F(ExtensionFromUserScript, RunAtDocumentEnd) {
test_file = test_file.AppendASCII("extensions")
.AppendASCII("user_script_run_at_end.user.js");
- string16 error;
+ base::string16 error;
scoped_refptr<Extension> extension(ConvertUserScriptToExtension(
test_file, GURL("http://www.google.com/foo"),
extensions_dir.path(), &error));
@@ -232,7 +232,7 @@ TEST_F(ExtensionFromUserScript, RunAtDocumentIdle) {
.AppendASCII("user_script_run_at_idle.user.js");
ASSERT_TRUE(base::PathExists(test_file)) << test_file.value();
- string16 error;
+ base::string16 error;
scoped_refptr<Extension> extension(ConvertUserScriptToExtension(
test_file, GURL("http://www.google.com/foo"),
extensions_dir.path(), &error));