Resubmit http://codereview.chromium.org/314016 with views fixed

chrome/browser/views/bookmark_bar_view.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/bookmark_bar_view.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <vector>
@@ skipping 1690 matching lines @@
   }
   return prefsize;
 }
 
 #if defined(BROWSER_SYNC)
 // The sync state reported by the profile sync service determines whether or
 // not the re-login indicator button should be visible.
 bool BookmarkBarView::ShouldShowSyncErrorButton() {
   bool show_sync_error_button(false);
   if (sync_service_ && sync_service_->HasSyncSetupCompleted()) {
-    std::wstring status_text;
-    std::wstring link_text;
+    string16 status_text;
+    string16 link_text;
     SyncStatusUIHelper::MessageType sync_status;
     sync_status = SyncStatusUIHelper::GetLabels(
         sync_service_, &status_text, &link_text);
     if (sync_status == SyncStatusUIHelper::SYNC_ERROR) {
       show_sync_error_button = true;
     }
   }
   return show_sync_error_button;
 }
 
 views::TextButton* BookmarkBarView::CreateSyncErrorButton() {
   views::TextButton* sync_error_button =
       new views::TextButton(this,
               l10n_util::GetString(IDS_SYNC_BOOKMARK_BAR_ERROR));
   sync_error_button->set_tag(kSyncErrorButtonTag);
 
   // The tooltip is the only way we have to display text explaining the error
   // to the user.
   sync_error_button->SetTooltipText(
       l10n_util::GetString(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC));
   sync_error_button->SetAccessibleName(
       l10n_util::GetString(IDS_ACCNAME_SYNC_ERROR_BUTTON));
   sync_error_button->SetIcon(
       *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING));
   return sync_error_button;
 }
 #endif  // defined(BROWSER_SYNC)
-