Turned UiStrings into a singleton so that the continue window does not depend on ChromotingHost.

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/continue_window.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/disconnect_window.h"
 #include "remoting/host/event_executor.h"
 #include "remoting/host/host_status_observer.h"
 #include "remoting/host/local_input_monitor.h"
-#include "remoting/host/ui_strings.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 {
@@ skipping 20 matching lines @@
   virtual scoped_ptr<VideoFrameCapturer> CreateVideoCapturer(
       scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner) OVERRIDE;
 };
 
 class MockDisconnectWindow : public DisconnectWindow {
  public:
   MockDisconnectWindow();
   virtual ~MockDisconnectWindow();
 
-  MOCK_METHOD3(Show, bool(const UiStrings& ui_strings,
-                          const base::Closure& disconnect_callback,
+  MOCK_METHOD2(Show, bool(const base::Closure& disconnect_callback,
                           const std::string& username));
   MOCK_METHOD0(Hide, void());
 };
 
 class MockLocalInputMonitor : public LocalInputMonitor {
  public:
   MockLocalInputMonitor();
   virtual ~MockLocalInputMonitor();
 
   MOCK_METHOD2(Start, void(MouseMoveObserver* mouse_move_observer,
                            const base::Closure& disconnect_callback));
   MOCK_METHOD0(Stop, void());
 };
 
 class MockContinueWindow : public ContinueWindow {
  public:
   MockContinueWindow();
   virtual ~MockContinueWindow();
 
-  MOCK_METHOD2(Show, void(
-      remoting::ChromotingHost* host,
+  MOCK_METHOD1(Show, void(
       const remoting::ContinueWindow::ContinueSessionCallback& callback));
   MOCK_METHOD0(Hide, void());
 };
 
 class MockClientSessionEventHandler : public ClientSession::EventHandler {
  public:
   MockClientSessionEventHandler();
   virtual ~MockClientSessionEventHandler();
 
   MOCK_METHOD1(OnSessionAuthenticated, void(ClientSession* client));
@@ skipping 60 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_