Made DesktopEnvironment responsible for creation of the disconnect window.

remoting/host/host_mock_objects.h

 // Copyright (c) 2012 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 REMOTING_HOST_HOST_MOCK_OBJECTS_H_
 #define REMOTING_HOST_HOST_MOCK_OBJECTS_H_
 
 #include "net/base/ip_endpoint.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/client_session.h"
 #include "remoting/host/client_session_control.h"
 #include "remoting/host/continue_window.h"
 #include "remoting/host/desktop_environment.h"
-#include "remoting/host/disconnect_window.h"
 #include "remoting/host/host_status_observer.h"
+#include "remoting/host/host_window.h"
 #include "remoting/host/input_injector.h"
 #include "remoting/host/screen_controls.h"
 #include "remoting/host/screen_resolution.h"
 #include "remoting/proto/control.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace remoting {
 
 class MockDesktopEnvironment : public DesktopEnvironment {
  public:
   MockDesktopEnvironment();
   virtual ~MockDesktopEnvironment();
 
   MOCK_METHOD0(CreateAudioCapturerPtr, AudioCapturer*());
   MOCK_METHOD0(CreateInputInjectorPtr, InputInjector*());
   MOCK_METHOD0(CreateScreenControlsPtr, ScreenControls*());
   MOCK_METHOD0(CreateVideoCapturerPtr, media::ScreenCapturer*());
 
   // DesktopEnvironment implementation.
   virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() OVERRIDE;
   virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE;
   virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE;
   virtual scoped_ptr<media::ScreenCapturer> CreateVideoCapturer() OVERRIDE;
 };
 
-class MockDisconnectWindow : public DisconnectWindow {
- public:
-  MockDisconnectWindow();
-  virtual ~MockDisconnectWindow();
-
-  MOCK_METHOD2(Show, bool(const base::Closure& disconnect_callback,
-                          const std::string& username));
-  MOCK_METHOD0(Hide, void());
-};
-
 class MockContinueWindow : public ContinueWindow {
  public:
   MockContinueWindow();
   virtual ~MockContinueWindow();
 
   MOCK_METHOD1(Show, void(
       const remoting::ContinueWindow::ContinueSessionCallback& callback));
   MOCK_METHOD0(Hide, void());
 };
 
@@ skipping 77 matching lines @@
                void(const std::string& jid,
                     const std::string& channel_name,
                     const protocol::TransportRoute& route));
   MOCK_METHOD1(OnStart, void(const std::string& xmpp_login));
   MOCK_METHOD0(OnShutdown, void());
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_HOST_MOCK_OBJECTS_H_