Final part of PathString cleanup.

chrome/browser/sync/engine/syncapi.cc

 // Copyright (c) 2006-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/sync/engine/syncapi.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 117 matching lines @@
  private:
   AddressWatchTaskParams* const params_;
   DISALLOW_COPY_AND_ASSIGN(AddressWatchTask);
 };
 
 namespace sync_api {
 class ModelSafeWorkerBridge;
 
 static const FilePath::CharType kBookmarkSyncUserSettingsDatabase[] =
     FILE_PATH_LITERAL("BookmarkSyncSettings.sqlite3");
-static const PSTR_CHAR kDefaultNameForNewNodes[] = PSTR(" ");
+static const char kDefaultNameForNewNodes[] = " ";
 
 // The list of names which are reserved for use by the server.
 static const char* kForbiddenServerNames[] = { "", ".", ".." };
 
 //////////////////////////////////////////////////////////////////////////
 // Static helper functions.
 
 // Helper function to look up the int64 metahandle of an object given the ID
 // string.
 static int64 IdToMetahandle(syncable::BaseTransaction* trans,
@@ skipping 158 matching lines @@
     return;  // Skip redundant changes.
 
   entry_->Put(syncable::IS_DIR, folder);
   MarkForSyncing();
 }
 
 void WriteNode::SetTitle(const std::wstring& title) {
   std::string server_legal_name;
   SyncAPINameToServerName(title, &server_legal_name);
 
-  PathString old_name = entry_->Get(syncable::NON_UNIQUE_NAME);
+  string old_name = entry_->Get(syncable::NON_UNIQUE_NAME);
 
   if (server_legal_name == old_name)
     return;  // Skip redundant changes.
 
   entry_->Put(syncable::NON_UNIQUE_NAME, server_legal_name);
   MarkForSyncing();
 }
 
 void WriteNode::SetURL(const GURL& url) {
   const std::string& url_string = url.spec();
@@ skipping 36 matching lines @@
   // |predecessor| must be a child of |parent| or NULL.
   if (predecessor && predecessor->GetParentId() != parent.GetId()) {
     DCHECK(false);
     return false;
   }
 
   syncable::Id parent_id = parent.GetEntry()->Get(syncable::ID);
 
   // Start out with a dummy name.  We expect
   // the caller to set a meaningful name after creation.
-  PathString dummy(kDefaultNameForNewNodes);
+  string dummy(kDefaultNameForNewNodes);
 
   entry_ = new syncable::MutableEntry(transaction_->GetWrappedWriteTrans(),
                                       syncable::CREATE, parent_id, dummy);
 
   if (!entry_->good())
     return false;
 
   // Entries are untitled folders by default.
   entry_->Put(syncable::IS_DIR, true);
   // TODO(ncarter): Naming this bit IS_BOOKMARK_OBJECT is a bit unfortunate,
@@ skipping 1116 matching lines @@
 BaseTransaction::~BaseTransaction() {
   delete lookup_;
 }
 
 UserShare* SyncManager::GetUserShare() const {
   DCHECK(data_->initialized()) << "GetUserShare requires initialization!";
   return data_->GetUserShare();
 }
 
 }  // namespace sync_api