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

chrome/browser/dom_ui/new_tab_page_sync_handler.cc

 // Copyright (c) 2006-2008 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.
 
 #if defined(BROWSER_SYNC)
 
 #include "chrome/browser/dom_ui/new_tab_page_sync_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/string_util.h"
@@ skipping 127 matching lines @@
     }
     return;
   }
 
   // Once sync has been enabled, the supported "sync statuses" for the NNTP
   // from the user's perspective are:
   //
   // "Sync error", when we can't authenticate or establish a connection with
   //               the sync server (appropriate information appended to
   //               message).
-  std::wstring status_msg;
-  std::wstring link_text;
+  string16 status_msg;
+  string16 link_text;
   SyncStatusUIHelper::MessageType type =
       SyncStatusUIHelper::GetLabels(sync_service_, &status_msg, &link_text);
   SendSyncMessageToPage(FromSyncStatusMessageType(type),
-                        WideToUTF8(status_msg), WideToUTF8(link_text));
+                        UTF16ToUTF8(status_msg), UTF16ToUTF8(link_text));
 }
 
 void NewTabPageSyncHandler::HandleSyncLinkClicked(const Value* value) {
   DCHECK(!waiting_for_initial_page_load_);
   DCHECK(sync_service_);
   if (sync_service_->HasSyncSetupCompleted()) {
     // User clicked the 'Login again' link to re-authenticate.
     sync_service_->ShowLoginDialog();
   } else {
     // User clicked the 'Start now' link to begin syncing.
@@ skipping 58 matching lines @@
       } else {
         value.SetBoolean(L"linkurlisset", true);
         value.SetString(L"linkurl", linkurl);
       }
     }
   }
   dom_ui_->CallJavascriptFunction(L"syncMessageChanged", value);
 }
 
 #endif  // defined(BROWSER_SYNC)