Made DesktopEnvironment responsible for creation of the disconnect window.

remoting/host/host_mock_objects.h

Index: remoting/host/host_mock_objects.h
diff --git a/remoting/host/host_mock_objects.h b/remoting/host/host_mock_objects.h
index 690dc056461913f948aba423c44e4edb4ed21150..0dd4020321aa0e4d3184727df90b73ad3d0da672 100644
--- a/remoting/host/host_mock_objects.h
+++ b/remoting/host/host_mock_objects.h
@@ -11,8 +11,8 @@
 #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"
@@ -42,16 +42,6 @@ class MockDesktopEnvironment : public DesktopEnvironment {
   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();