From 439f1e3d98de0a2021d71c8bb48773663c337b5a Mon Sep 17 00:00:00 2001
From: "brettw@chromium.org"
 <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 9 Dec 2013 20:09:09 +0000
Subject: 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
---
 chrome/browser/extensions/api/file_system/file_system_api.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'chrome/browser/extensions/api/file_system/file_system_api.cc')

diff --git a/chrome/browser/extensions/api/file_system/file_system_api.cc b/chrome/browser/extensions/api/file_system/file_system_api.cc
index 7dac9bb..67d717b 100644
--- a/chrome/browser/extensions/api/file_system/file_system_api.cc
+++ b/chrome/browser/extensions/api/file_system/file_system_api.cc
@@ -153,7 +153,7 @@ bool g_allow_directory_access_for_test = false;
 bool GetFileTypesFromAcceptOption(
     const file_system::AcceptOption& accept_option,
     std::vector<base::FilePath::StringType>* extensions,
-    string16* description) {
+    base::string16* description) {
   std::set<base::FilePath::StringType> extension_set;
   int description_id = 0;
 
@@ -469,7 +469,7 @@ class FileSystemChooseEntryFunction::FilePicker
     }
 
     select_file_dialog_->SelectFile(picker_type,
-                                    string16(),
+                                    base::string16(),
                                     suggested_name,
                                     &file_type_info,
                                     0,
@@ -774,7 +774,7 @@ void FileSystemChooseEntryFunction::BuildFileTypeInfo(
     typedef file_system::AcceptOption AcceptOption;
     for (std::vector<linked_ptr<AcceptOption> >::const_iterator iter =
             accepts->begin(); iter != accepts->end(); ++iter) {
-      string16 description;
+      base::string16 description;
       std::vector<base::FilePath::StringType> extensions;
 
       if (!GetFileTypesFromAcceptOption(**iter, &extensions, &description))
-- 
cgit v1.1