diff options
| author | peria@chromium.org <peria@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 07:31:03 +0000 |
|---|---|---|
| committer | peria@chromium.org <peria@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 07:31:03 +0000 |
| commit | 33f27eeb3a69a249bbd4f9671e755663702cd5a6 (patch) | |
| tree | ee3bda1df7fd8ce97b7923aadf3c2de684455631 /chrome/browser/sync_file_system/drive_file_sync_service.cc | |
| parent | da743e8f38956985a85bdd7dbf9023e41b9a6adc (diff) | |
| download | chromium_src-33f27eeb3a69a249bbd4f9671e755663702cd5a6.zip chromium_src-33f27eeb3a69a249bbd4f9671e755663702cd5a6.tar.gz chromium_src-33f27eeb3a69a249bbd4f9671e755663702cd5a6.tar.bz2 | |
Replace string16 with std::string in gdata_wapi_parser.{h,cc}.
BUG=169384
TEST=build unit_tests without errors.
Review URL: https://chromiumcodereview.appspot.com/12244002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync_file_system/drive_file_sync_service.cc')
| -rw-r--r-- | chrome/browser/sync_file_system/drive_file_sync_service.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_file_sync_service.cc index 69d8848..bb80a68 100644 --- a/chrome/browser/sync_file_system/drive_file_sync_service.cc +++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc @@ -5,6 +5,7 @@ #include "chrome/browser/sync_file_system/drive_file_sync_service.h" #include <algorithm> +#include <string> #include <utility> #include "base/bind.h" @@ -1642,7 +1643,7 @@ bool DriveFileSyncService::AppendRemoteChange( int64 changestamp, RemoteSyncType sync_type) { // TODO(tzik): Normalize the path here. - FilePath path = FilePath::FromUTF8Unsafe(UTF16ToUTF8(entry.title())); + FilePath path = FilePath::FromUTF8Unsafe(entry.title()); DCHECK(!entry.is_folder()); return AppendRemoteChangeInternal( origin, path, entry.deleted(), @@ -1871,8 +1872,7 @@ bool DriveFileSyncService::GetOriginForEntry( itr != entry.links().end(); ++itr) { if ((*itr)->type() != google_apis::Link::LINK_PARENT) continue; - GURL origin(DriveFileSyncClient::DirectoryTitleToOrigin( - UTF16ToUTF8((*itr)->title()))); + GURL origin(DriveFileSyncClient::DirectoryTitleToOrigin((*itr)->title())); DCHECK(origin.is_valid()); if (!metadata_store_->IsBatchSyncOrigin(origin) && |