Index: chrome/browser/chromeos/memory/oom_priority_manager.cc |
diff --git a/chrome/browser/chromeos/memory/oom_priority_manager.cc b/chrome/browser/chromeos/memory/oom_priority_manager.cc |
index 8ad3a6b582211317ea16ff92841f906635ecbb77..6de6c82eece9858f1c61a448653bc0f9c789fc9e 100644 |
--- a/chrome/browser/chromeos/memory/oom_priority_manager.cc |
+++ b/chrome/browser/chromeos/memory/oom_priority_manager.cc |
@@ -213,14 +213,14 @@ void OomPriorityManager::Stop() { |
low_memory_listener_->Stop(); |
} |
-std::vector<string16> OomPriorityManager::GetTabTitles() { |
+std::vector<base::string16> OomPriorityManager::GetTabTitles() { |
TabStatsList stats = GetTabStatsOnUIThread(); |
base::AutoLock pid_to_oom_score_autolock(pid_to_oom_score_lock_); |
- std::vector<string16> titles; |
+ std::vector<base::string16> titles; |
titles.reserve(stats.size()); |
TabStatsList::iterator it = stats.begin(); |
for ( ; it != stats.end(); ++it) { |
- string16 str; |
+ base::string16 str; |
str.reserve(4096); |
int score = pid_to_oom_score_[it->renderer_handle]; |
str += base::IntToString16(score); |