From c4f8fdcd67231e7786b690be805d9f036ed0f324 Mon Sep 17 00:00:00 2001 From: "akalin@chromium.org" Date: Fri, 16 Oct 2009 07:05:52 +0000 Subject: Reverted 29255. TBR: nick@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29256 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/sync/engine/mock_server_connection.cc | 5 ++--- chrome/test/sync/engine/test_directory_setter_upper.cc | 6 ++++++ 2 files changed, 8 insertions(+), 3 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 b2af891..372d408 100644 --- a/chrome/test/sync/engine/mock_server_connection.cc +++ b/chrome/test/sync/engine/mock_server_connection.cc @@ -43,9 +43,9 @@ MockConnectionManager::MockConnectionManager(DirectoryManager* dirmgr, directory_name_(name), mid_commit_callback_function_(NULL), mid_commit_observer_(NULL), + client_command_(NULL), throttling_(false), fail_non_periodic_get_updates_(false), - client_command_(NULL), next_position_in_parent_(2) { server_reachable_ = true; }; @@ -405,5 +405,4 @@ void MockConnectionManager::ThrottleNextRequest( throttling_ = true; if (visitor) visitor->VisitAtomically(); -} - +} \ No newline at end of file diff --git a/chrome/test/sync/engine/test_directory_setter_upper.cc b/chrome/test/sync/engine/test_directory_setter_upper.cc index 9e910f0..2685795 100644 --- a/chrome/test/sync/engine/test_directory_setter_upper.cc +++ b/chrome/test/sync/engine/test_directory_setter_upper.cc @@ -85,6 +85,12 @@ void ManuallyOpenedTestDirectorySetterUpper::TearDown() { TestDirectorySetterUpper::TearDown(); } } + +static PathString UTF8ToPathStringQuick(const std::string &str) { + PathString ret; + CHECK(browser_sync::UTF8ToPathString(str.data(), str.size(), &ret)); + return ret; +} TriggeredOpenTestDirectorySetterUpper::TriggeredOpenTestDirectorySetterUpper( const std::string& name) -- cgit v1.1