summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-02 05:29:53 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-02 05:29:53 +0000
commit8790210c68de5ab29e54a46f761a7a8d60430334 (patch)
tree159098319252d715c174230adbeb88338a6f67e4 /content
parent05fd507a71a552edc3290adc35c45dfdc13d251a (diff)
downloadchromium_src-8790210c68de5ab29e54a46f761a7a8d60430334.zip
chromium_src-8790210c68de5ab29e54a46f761a7a8d60430334.tar.gz
chromium_src-8790210c68de5ab29e54a46f761a7a8d60430334.tar.bz2
Move EmptyString, kWhitespace and the BOM to base.
This moves EmptyString*, kWhitespace*, and the UTF 8 Byte Order Marker to the base:: namespace. Many of them just got changed to a default-constructed string when a reference was not required. I qualified some string16s with base:: when I was changing adjacent code. I need to do another pass to finish these up. BUG= TBR=sky@chromium.org Review URL: https://codereview.chromium.org/89243003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/java/java_method.cc2
-rw-r--r--content/common/android/address_parser.cc6
-rw-r--r--content/common/android/address_parser_unittest.cc8
-rw-r--r--content/renderer/media/crypto/proxy_decryptor.cc2
4 files changed, 9 insertions, 9 deletions
diff --git a/content/browser/renderer_host/java/java_method.cc b/content/browser/renderer_host/java/java_method.cc
index ef2d097..5a654fe 100644
--- a/content/browser/renderer_host/java/java_method.cc
+++ b/content/browser/renderer_host/java/java_method.cc
@@ -86,7 +86,7 @@ std::string BinaryNameToJNIName(const std::string& binary_name,
return jni_name;
}
NOTREACHED();
- return EmptyString();
+ return std::string();
}
} // namespace
diff --git a/content/common/android/address_parser.cc b/content/common/android/address_parser.cc
index ea1aa47..f4587c8 100644
--- a/content/common/android/address_parser.cc
+++ b/content/common/android/address_parser.cc
@@ -69,9 +69,9 @@ bool FindAddress(const string16::const_iterator& begin,
// by a valid zip code for that state. Also keep a look for any other
// possible house numbers to continue from in case of no match and for
// state names not followed by a zip code (e.g. New York, NY 10000).
- const string16 newline_delimiters = kNewlineDelimiters;
- const string16 delimiters = kWhitespaceUTF16 + newline_delimiters;
- for (string16::const_iterator it = begin; it != end; ) {
+ const base::string16 newline_delimiters = kNewlineDelimiters;
+ const base::string16 delimiters = base::kWhitespaceUTF16 + newline_delimiters;
+ for (base::string16::const_iterator it = begin; it != end; ) {
Word house_number;
if (!house_number_parser.Parse(it, end, &house_number))
return false;
diff --git a/content/common/android/address_parser_unittest.cc b/content/common/android/address_parser_unittest.cc
index c1f61f0..30497b2 100644
--- a/content/common/android/address_parser_unittest.cc
+++ b/content/common/android/address_parser_unittest.cc
@@ -16,9 +16,9 @@ class AddressParserTest : public testing::Test {
public:
AddressParserTest() {}
- void TokenizeWords(const string16& content, WordList* words) const {
+ void TokenizeWords(const base::string16& content, WordList* words) const {
String16Tokenizer tokenizer(content.begin(), content.end(),
- kWhitespaceUTF16);
+ base::kWhitespaceUTF16);
while (tokenizer.GetNext()) {
words->push_back(Word(tokenizer.token_begin(), tokenizer.token_end()));
}
@@ -40,9 +40,9 @@ class AddressParserTest : public testing::Test {
}
bool GetState(const std::string& state, size_t* state_index) const {
- string16 state_16 = UTF8ToUTF16(state);
+ base::string16 state_16 = UTF8ToUTF16(state);
String16Tokenizer tokenizer(state_16.begin(), state_16.end(),
- kWhitespaceUTF16);
+ base::kWhitespaceUTF16);
if (!tokenizer.GetNext())
return false;
diff --git a/content/renderer/media/crypto/proxy_decryptor.cc b/content/renderer/media/crypto/proxy_decryptor.cc
index 088decc..4716405 100644
--- a/content/renderer/media/crypto/proxy_decryptor.cc
+++ b/content/renderer/media/crypto/proxy_decryptor.cc
@@ -264,7 +264,7 @@ const std::string& ProxyDecryptor::LookupSessionId(uint32 reference_id) {
// Session may not exist if error happens during GenerateKeyRequest().
SessionIdMap::iterator it = sessions_.find(reference_id);
- return (it != sessions_.end()) ? it->second : EmptyString();
+ return (it != sessions_.end()) ? it->second : base::EmptyString();
}
} // namespace content