From 6d201be0c55eccdc015124e221d2559a6da7fef0 Mon Sep 17 00:00:00 2001 From: "munjal@chromium.org" Date: Fri, 13 Nov 2009 19:40:59 +0000 Subject: Part 1 of removing PathSTring. I scrubbed files that are not in chron's CL to avoid merge. Review URL: http://codereview.chromium.org/393011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31930 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/sync/engine/mock_server_connection.cc | 4 ++-- chrome/test/sync/engine/mock_server_connection.h | 7 ++++--- chrome/test/sync/engine/test_directory_setter_upper.cc | 2 +- chrome/test/sync/engine/test_directory_setter_upper.h | 8 +++++--- 4 files changed, 12 insertions(+), 9 deletions(-) (limited to 'chrome/test/sync') diff --git a/chrome/test/sync/engine/mock_server_connection.cc b/chrome/test/sync/engine/mock_server_connection.cc index 02d38c9..28525b2 100644 --- a/chrome/test/sync/engine/mock_server_connection.cc +++ b/chrome/test/sync/engine/mock_server_connection.cc @@ -29,7 +29,7 @@ using syncable::ScopedDirLookup; using syncable::WriteTransaction; MockConnectionManager::MockConnectionManager(DirectoryManager* dirmgr, - PathString name) + const string& name) : ServerConnectionManager("unused", 0, false, "version", "id"), conflict_all_commits_(false), conflict_n_commits_(0), @@ -377,7 +377,7 @@ SyncEntity* MockConnectionManager::AddUpdateBookmark( } void MockConnectionManager::AddUpdateExtendedAttributes(SyncEntity* ent, - PathString* xattr_key, syncable::Blob* xattr_value, int xattr_count) { + string* xattr_key, syncable::Blob* xattr_value, int xattr_count) { sync_pb::ExtendedAttributes* mutable_extended_attributes = ent->mutable_extended_attributes(); for (int i = 0; i < xattr_count; i++) { diff --git a/chrome/test/sync/engine/mock_server_connection.h b/chrome/test/sync/engine/mock_server_connection.h index afc28d9..f4a110c 100644 --- a/chrome/test/sync/engine/mock_server_connection.h +++ b/chrome/test/sync/engine/mock_server_connection.h @@ -36,7 +36,8 @@ class MockConnectionManager : public browser_sync::ServerConnectionManager { virtual void Observe() = 0; }; - MockConnectionManager(syncable::DirectoryManager* dirmgr, PathString name); + MockConnectionManager(syncable::DirectoryManager* dirmgr, + const std::string& name); virtual ~MockConnectionManager(); // Overridden ServerConnectionManager functions. @@ -97,7 +98,7 @@ class MockConnectionManager : public browser_sync::ServerConnectionManager { int64 version, int64 sync_ts); void AddUpdateExtendedAttributes(sync_pb::SyncEntity* ent, - PathString* xattr_key, + std::string* xattr_key, syncable::Blob* xattr_value, int xattr_count); // Prepare to add checksums. @@ -204,7 +205,7 @@ class MockConnectionManager : public browser_sync::ServerConnectionManager { // Our directory. syncable::DirectoryManager* directory_manager_; - PathString directory_name_; + std::string directory_name_; // The updates we'll return to the next request. sync_pb::GetUpdatesResponse updates_; diff --git a/chrome/test/sync/engine/test_directory_setter_upper.cc b/chrome/test/sync/engine/test_directory_setter_upper.cc index a41f160..999ddc2 100644 --- a/chrome/test/sync/engine/test_directory_setter_upper.cc +++ b/chrome/test/sync/engine/test_directory_setter_upper.cc @@ -18,7 +18,7 @@ using syncable::ScopedDirLookup; namespace browser_sync { TestDirectorySetterUpper::TestDirectorySetterUpper() : name_(PSTR("Test")) {} -TestDirectorySetterUpper::TestDirectorySetterUpper(const PathString& name) +TestDirectorySetterUpper::TestDirectorySetterUpper(const std::string& name) : name_(name) {} TestDirectorySetterUpper::~TestDirectorySetterUpper() {} diff --git a/chrome/test/sync/engine/test_directory_setter_upper.h b/chrome/test/sync/engine/test_directory_setter_upper.h index 7e2cf48..aefca40 100644 --- a/chrome/test/sync/engine/test_directory_setter_upper.h +++ b/chrome/test/sync/engine/test_directory_setter_upper.h @@ -30,6 +30,8 @@ #ifndef CHROME_TEST_SYNC_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_ #define CHROME_TEST_SYNC_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_ +#include + #include "base/scoped_ptr.h" #include "chrome/browser/sync/syncable/syncable.h" #include "chrome/browser/sync/util/sync_types.h" @@ -56,18 +58,18 @@ class TestDirectorySetterUpper { virtual void TearDown(); syncable::DirectoryManager* manager() const { return manager_.get(); } - const PathString& name() const { return name_; } + const std::string& name() const { return name_; } protected: // Subclasses may want to use a different directory name. - explicit TestDirectorySetterUpper(const PathString& name); + explicit TestDirectorySetterUpper(const std::string& name); virtual void Init(); private: void RunInvariantCheck(const syncable::ScopedDirLookup& dir); scoped_ptr manager_; - const PathString name_; + const std::string name_; FilePath file_path_; }; -- cgit v1.1