Revert 105667 - Send important client side event information to the server. We create a class cal...

chrome/browser/sync/test/engine/syncer_command_test.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_
 #define CHROME_BROWSER_SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_
 #pragma once
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #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.
 template<typename T>
 class SyncerCommandTestWithParam : public testing::TestWithParam<T>,
                                    public sessions::SyncSession::Delegate,
                                    public ModelSafeWorkerRegistrar {
  public:
   enum UseMockDirectory {
     USE_MOCK_DIRECTORY
@@ skipping 77 matching lines @@
     return session_.get();
   }
 
   void ClearSession() {
     session_.reset();
   }
 
   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();
   }
 
   // Install a MockServerConnection.  Resets the context.  By default,
   // the context does not have a MockServerConnection attached.
   void ConfigureMockServerConnection() {
     mock_server_.reset(
         new MockConnectionManager(syncdb_->manager(), syncdb_->name()));
     ResetContext();
   }
 
   std::vector<scoped_refptr<ModelSafeWorker> >* workers() {
     return &workers_;
   }
 
   const ModelSafeRoutingInfo& routing_info() { return routing_info_; }
   ModelSafeRoutingInfo* mutable_routing_info() { return &routing_info_; }
 
   MockConnectionManager* mock_server() {
     return mock_server_.get();
   }
 
-  MockDebugInfoGetter* mock_debug_info_getter() {
-    return &mock_debug_info_getter_;
-  }
-
  private:
   scoped_ptr<TestDirectorySetterUpper> syncdb_;
   scoped_ptr<sessions::SyncSessionContext> context_;
   scoped_ptr<MockConnectionManager> mock_server_;
   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);
 };
 
 class SyncerCommandTest : public SyncerCommandTestWithParam<void*> {};
 
 class MockDirectorySyncerCommandTest
     : public SyncerCommandTestWithParam<void*> {
  public:
   MockDirectorySyncerCommandTest()
       : SyncerCommandTestWithParam<void*>(
           SyncerCommandTestWithParam<void*>::USE_MOCK_DIRECTORY) {}
   MockDirectorySetterUpper::MockDirectory* mock_directory() {
     return static_cast<MockDirectorySetterUpper*>(syncdb())->directory();
   }
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_