summaryrefslogtreecommitdiffstats
path: root/chromeos/dbus
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 /chromeos/dbus
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 'chromeos/dbus')
-rw-r--r--chromeos/dbus/fake_session_manager_client.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chromeos/dbus/fake_session_manager_client.cc b/chromeos/dbus/fake_session_manager_client.cc
index 482d3a5..7445847 100644
--- a/chromeos/dbus/fake_session_manager_client.cc
+++ b/chromeos/dbus/fake_session_manager_client.cc
@@ -148,7 +148,7 @@ const std::string& FakeSessionManagerClient::user_policy(
const std::string& username) const {
std::map<std::string, std::string>::const_iterator it =
user_policies_.find(username);
- return it == user_policies_.end() ? EmptyString() : it->second;
+ return it == user_policies_.end() ? base::EmptyString() : it->second;
}
void FakeSessionManagerClient::set_user_policy(const std::string& username,
@@ -161,7 +161,7 @@ const std::string& FakeSessionManagerClient::device_local_account_policy(
std::map<std::string, std::string>::const_iterator entry =
device_local_account_policy_.find(account_id);
return entry != device_local_account_policy_.end() ? entry->second
- : EmptyString();
+ : base::EmptyString();
}
void FakeSessionManagerClient::set_device_local_account_policy(