diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-17 23:55:43 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-17 23:55:43 +0000 |
commit | bd6fc2fb1af851ac7e2f4a3e08ad3a92ab6ba4af (patch) | |
tree | db093d44a2b6964ae5b54b140bdef71a8b7a337d /ppapi | |
parent | bec9fd9900ed7fe4ed3fe5b3d9f56ec4ba1fe56b (diff) | |
download | chromium_src-bd6fc2fb1af851ac7e2f4a3e08ad3a92ab6ba4af.zip chromium_src-bd6fc2fb1af851ac7e2f4a3e08ad3a92ab6ba4af.tar.gz chromium_src-bd6fc2fb1af851ac7e2f4a3e08ad3a92ab6ba4af.tar.bz2 |
Revert 257524 "Move IsStringASCII/UTF8 to base namespace."
> Move IsStringASCII/UTF8 to base namespace.
>
> Use StringPiece for IsStringUTF8.
>
> TBR=sky
>
> Review URL: https://codereview.chromium.org/196793010
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/198163004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257533 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r-- | ppapi/shared_impl/dictionary_var.cc | 2 | ||||
-rw-r--r-- | ppapi/shared_impl/file_ref_util.cc | 2 | ||||
-rw-r--r-- | ppapi/shared_impl/var.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ppapi/shared_impl/dictionary_var.cc b/ppapi/shared_impl/dictionary_var.cc index 8676c43..54d2010 100644 --- a/ppapi/shared_impl/dictionary_var.cc +++ b/ppapi/shared_impl/dictionary_var.cc @@ -90,7 +90,7 @@ PP_Var DictionaryVar::GetKeys() const { bool DictionaryVar::SetWithStringKey(const std::string& utf8_key, const PP_Var& value) { - if (!base::IsStringUTF8(utf8_key)) + if (!IsStringUTF8(utf8_key)) return false; key_value_map_[utf8_key] = value; diff --git a/ppapi/shared_impl/file_ref_util.cc b/ppapi/shared_impl/file_ref_util.cc index a5523cb..3be8e0a 100644 --- a/ppapi/shared_impl/file_ref_util.cc +++ b/ppapi/shared_impl/file_ref_util.cc @@ -36,7 +36,7 @@ bool IsValidInternalPath(const std::string& path) { // The path starts with '/' // The path must contain valid UTF-8 characters. // It must not FilePath::ReferencesParent(). - if (path.empty() || !base::IsStringUTF8(path) || path[0] != '/') + if (path.empty() || !IsStringUTF8(path) || path[0] != '/') return false; base::FilePath file_path = base::FilePath::FromUTF8Unsafe(path); if (file_path.ReferencesParent()) diff --git a/ppapi/shared_impl/var.cc b/ppapi/shared_impl/var.cc index 3020182..8f3ddb5 100644 --- a/ppapi/shared_impl/var.cc +++ b/ppapi/shared_impl/var.cc @@ -148,7 +148,7 @@ PP_Var StringVar::StringToPPVar(const std::string& var) { // static PP_Var StringVar::StringToPPVar(const char* data, uint32 len) { scoped_refptr<StringVar> str(new StringVar(data, len)); - if (!str.get() || !base::IsStringUTF8(str->value())) + if (!str.get() || !IsStringUTF8(str->value())) return PP_MakeNull(); return str->GetPPVar(); } |