Tidy up ChromotingInstance members a little.

remoting/client/plugin/chromoting_instance.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.
 
 // TODO(ajwong): We need to come up with a better description of the
 // responsibilities for each thread.
 
 #ifndef REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
 #define REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
 
@@ skipping 13 matching lines @@
 // include instance_private.h
 #if defined(PostMessage)
 #undef PostMessage
 #endif
 
 #include "ppapi/cpp/instance.h"
 #include "remoting/client/client_context.h"
 #include "remoting/client/client_user_interface.h"
 #include "remoting/client/key_event_mapper.h"
 #include "remoting/client/plugin/mac_key_event_processor.h"
+#include "remoting/client/plugin/pepper_input_handler.h"
 #include "remoting/client/plugin/pepper_plugin_thread_delegate.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/cursor_shape_stub.h"
+#include "remoting/protocol/input_event_tracker.h"
+#include "remoting/protocol/mouse_input_filter.h"
 
 namespace base {
 class DictionaryValue;
 }  // namespace base
 
 namespace pp {
 class InputEvent;
 class Module;
 }  // namespace pp
 
 namespace remoting {
 
-namespace protocol {
-class InputEventTracker;
-class MouseInputFilter;
-}  // namespace protocol
-
 class ChromotingClient;
 class ChromotingStats;
 class ClientContext;
 class FrameConsumerProxy;
 class PepperAudioPlayer;
-class PepperInputHandler;
 class PepperView;
 class PepperXmppProxy;
 class RectangleUpdateDecoder;
 
 struct ClientConfig;
 
 class ChromotingInstance :
       public ClientUserInterface,
       public protocol::ClipboardStub,
       public protocol::CursorShapeStub,
@@ skipping 108 matching lines @@
   void ProcessLogToUI(const std::string& message);
 
   // Returns true if there is a ConnectionToHost and it is connected.
   bool IsConnected();
 
   bool initialized_;
 
   PepperPluginThreadDelegate plugin_thread_delegate_;
   scoped_refptr<PluginThreadTaskRunner> plugin_task_runner_;
   ClientContext context_;
-  scoped_ptr<protocol::ConnectionToHost> host_connection_;
+  scoped_refptr<RectangleUpdateDecoder> rectangle_decoder_;
   scoped_ptr<PepperView> view_;
 
-  scoped_refptr<RectangleUpdateDecoder> rectangle_decoder_;
+  scoped_ptr<protocol::ConnectionToHost> host_connection_;
+  scoped_ptr<ChromotingClient> client_;
 
-  scoped_ptr<protocol::MouseInputFilter> mouse_input_filter_;
-  scoped_ptr<protocol::InputEventTracker> input_tracker_;
+  // Input pipeline components, in reverse order of distance from input source.
+  protocol::MouseInputFilter mouse_input_filter_;
+  protocol::InputEventTracker input_tracker_;
 #if defined(OS_MACOSX)
-  scoped_ptr<MacKeyEventProcessor> mac_key_event_processor_;
+  MacKeyEventProcessor mac_key_event_processor_;
 #endif
   KeyEventMapper key_mapper_;
-  scoped_ptr<PepperInputHandler> input_handler_;
-  scoped_ptr<ChromotingClient> client_;
+  PepperInputHandler input_handler_;
 
   // XmppProxy is a refcounted interface used to perform thread-switching and
   // detaching between objects whose lifetimes are controlled by pepper, and
   // jingle_glue objects. This is used when if we start a sandboxed jingle
   // connection.
   scoped_refptr<PepperXmppProxy> xmpp_proxy_;
 
   base::WeakPtrFactory<ChromotingInstance> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingInstance);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_