Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(553)

Unified Diff: chrome/browser/sync/test/engine/syncer_command_test.h

Issue 8313002: Revert 105667 - Send important client side event information to the server. We create a class cal... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/test/engine/syncer_command_test.h
===================================================================
--- chrome/browser/sync/test/engine/syncer_command_test.h (revision 105679)
+++ chrome/browser/sync/test/engine/syncer_command_test.h (working copy)
@@ -12,25 +12,14 @@
#include "base/compiler_specific.h"
#include "chrome/browser/sync/engine/model_safe_worker.h"
-#include "chrome/browser/sync/sessions/debug_info_getter.h"
#include "chrome/browser/sync/sessions/sync_session.h"
#include "chrome/browser/sync/sessions/sync_session_context.h"
#include "chrome/browser/sync/test/engine/mock_connection_manager.h"
#include "chrome/browser/sync/test/engine/test_directory_setter_upper.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "testing/gmock/include/gmock/gmock.h"
-using ::testing::NiceMock;
-
namespace browser_sync {
-class MockDebugInfoGetter : public browser_sync::sessions::DebugInfoGetter {
- public:
- MockDebugInfoGetter();
- virtual ~MockDebugInfoGetter();
- MOCK_METHOD1(GetAndClearDebugInfo, void(sync_pb::DebugInfo* debug_info));
-};
-
// A test fixture that simplifies writing unit tests for individual
// SyncerCommands, providing convenient access to a test directory
// and a syncer session.
@@ -128,7 +117,7 @@
void ResetContext() {
context_.reset(new sessions::SyncSessionContext(
mock_server_.get(), syncdb_->manager(), registrar(),
- std::vector<SyncEngineEventListener*>(), &mock_debug_info_getter_));
+ std::vector<SyncEngineEventListener*>()));
context_->set_account_name(syncdb_->name());
ClearSession();
}
@@ -152,10 +141,6 @@
return mock_server_.get();
}
- MockDebugInfoGetter* mock_debug_info_getter() {
- return &mock_debug_info_getter_;
- }
-
private:
scoped_ptr<TestDirectorySetterUpper> syncdb_;
scoped_ptr<sessions::SyncSessionContext> context_;
@@ -163,7 +148,6 @@
scoped_ptr<sessions::SyncSession> session_;
std::vector<scoped_refptr<ModelSafeWorker> > workers_;
ModelSafeRoutingInfo routing_info_;
- NiceMock<MockDebugInfoGetter> mock_debug_info_getter_;
DISALLOW_COPY_AND_ASSIGN(SyncerCommandTestWithParam);
};
« no previous file with comments | « chrome/browser/sync/sessions/sync_session_unittest.cc ('k') | chrome/browser/sync/test/engine/syncer_command_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698