diff options
author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 00:10:32 +0000 |
---|---|---|
committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 00:10:32 +0000 |
commit | d07f0c801dbb2fdb6fcfaa671afa13400a615c85 (patch) | |
tree | 24c422c32dd749ce8969b055b470c355e2e1401a /chrome/test | |
parent | b0f1a563d2b0ff26b9a6ad81258e08b966c9149a (diff) | |
download | chromium_src-d07f0c801dbb2fdb6fcfaa671afa13400a615c85.zip chromium_src-d07f0c801dbb2fdb6fcfaa671afa13400a615c85.tar.gz chromium_src-d07f0c801dbb2fdb6fcfaa671afa13400a615c85.tar.bz2 |
A few cleanups to the sync unit tests.
I didn't want to mix these in with other changes that are due
to real expectations changes.
BUG=46769 (related work)
TEST=sync_unit_tests
Review URL: http://codereview.chromium.org/2811031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50791 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r-- | chrome/test/sync/engine/mock_connection_manager.cc (renamed from chrome/test/sync/engine/mock_server_connection.cc) | 2 | ||||
-rw-r--r-- | chrome/test/sync/engine/mock_connection_manager.h (renamed from chrome/test/sync/engine/mock_server_connection.h) | 6 | ||||
-rw-r--r-- | chrome/test/sync/engine/syncer_command_test.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/test/sync/engine/mock_server_connection.cc b/chrome/test/sync/engine/mock_connection_manager.cc index 86f4e69..5e40d5d 100644 --- a/chrome/test/sync/engine/mock_server_connection.cc +++ b/chrome/test/sync/engine/mock_connection_manager.cc @@ -4,7 +4,7 @@ // // Mock ServerConnectionManager class for use in client regression tests. -#include "chrome/test/sync/engine/mock_server_connection.h" +#include "chrome/test/sync/engine/mock_connection_manager.h" #include "chrome/browser/sync/engine/syncer_proto_util.h" #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" diff --git a/chrome/test/sync/engine/mock_server_connection.h b/chrome/test/sync/engine/mock_connection_manager.h index 33242c1..aaade7e 100644 --- a/chrome/test/sync/engine/mock_server_connection.h +++ b/chrome/test/sync/engine/mock_connection_manager.h @@ -4,8 +4,8 @@ // // Mock ServerConnectionManager class for use in client unit tests. -#ifndef CHROME_TEST_SYNC_ENGINE_MOCK_SERVER_CONNECTION_H_ -#define CHROME_TEST_SYNC_ENGINE_MOCK_SERVER_CONNECTION_H_ +#ifndef CHROME_TEST_SYNC_ENGINE_MOCK_CONNECTION_MANAGER_H_ +#define CHROME_TEST_SYNC_ENGINE_MOCK_CONNECTION_MANAGER_H_ #include <bitset> #include <string> @@ -287,4 +287,4 @@ class MockConnectionManager : public browser_sync::ServerConnectionManager { DISALLOW_COPY_AND_ASSIGN(MockConnectionManager); }; -#endif // CHROME_TEST_SYNC_ENGINE_MOCK_SERVER_CONNECTION_H_ +#endif // CHROME_TEST_SYNC_ENGINE_MOCK_CONNECTION_MANAGER_H_ diff --git a/chrome/test/sync/engine/syncer_command_test.h b/chrome/test/sync/engine/syncer_command_test.h index 5ce3faf..14e4da5 100644 --- a/chrome/test/sync/engine/syncer_command_test.h +++ b/chrome/test/sync/engine/syncer_command_test.h @@ -10,7 +10,7 @@ #include "chrome/browser/sync/engine/model_safe_worker.h" #include "chrome/browser/sync/sessions/sync_session.h" #include "chrome/browser/sync/sessions/sync_session_context.h" -#include "chrome/test/sync/engine/mock_server_connection.h" +#include "chrome/test/sync/engine/mock_connection_manager.h" #include "chrome/test/sync/engine/test_directory_setter_upper.h" #include "testing/gtest/include/gtest/gtest.h" |