| Index: chrome/browser/android/bookmarks/managed_bookmarks_shim.cc
|
| diff --git a/chrome/browser/android/bookmarks/managed_bookmarks_shim.cc b/chrome/browser/android/bookmarks/managed_bookmarks_shim.cc
|
| index 29dcf38c301c6784e1b7b7a48d7b2d4bf64fd76f..fa336656e30f86f1a7a7b7d38037d7b66aa669e2 100644
|
| --- a/chrome/browser/android/bookmarks/managed_bookmarks_shim.cc
|
| +++ b/chrome/browser/android/bookmarks/managed_bookmarks_shim.cc
|
| @@ -69,7 +69,7 @@ void ManagedBookmarksShim::Reload() {
|
| std::string username = prefs_->GetString(prefs::kGoogleServicesUsername);
|
| if (!username.empty())
|
| domain = gaia::ExtractDomainName(username);
|
| - string16 root_node_name;
|
| + base::string16 root_node_name;
|
| if (domain.empty()) {
|
| root_node_name =
|
| l10n_util::GetStringUTF16(IDS_POLICY_MANAGED_BOOKMARKS_DEFAULT_NAME);
|
| @@ -92,7 +92,7 @@ void ManagedBookmarksShim::Reload() {
|
| continue;
|
| }
|
|
|
| - string16 name;
|
| + base::string16 name;
|
| std::string url;
|
| if (!dict->GetString(ManagedBookmarksPolicyHandler::kName, &name) ||
|
| !dict->GetString(ManagedBookmarksPolicyHandler::kUrl, &url)) {
|
|
|