Some tiny cleanups.

remoting/host/client_session_unittest.cc

 // 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.
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 69 matching lines @@
 ACTION_P2(DeliverClientMessage, client_session, message) {
   client_session->DeliverClientMessage(message);
 }
 
 ACTION_P2(SetCapabilities, client_session, capabilities) {
   protocol::Capabilities capabilities_message;
   capabilities_message.set_capabilities(capabilities);
   client_session->SetCapabilities(capabilities_message);
 }
 
+MATCHER_P2(EqualsUsbEvent, usb_keycode, pressed, "") {
+  return arg.usb_keycode() == (unsigned int)usb_keycode &&
+         arg.pressed() == pressed;
+}
+
+MATCHER_P2(EqualsMouseEvent, x, y, "") {
+  return arg.x() == x && arg.y() == y;
+}
+
+MATCHER_P2(EqualsMouseButtonEvent, button, down, "") {
+  return arg.button() == button && arg.button_down() == down;
+}
+
 // Matches a |protocol::Capabilities| argument against a list of capabilities
 // formatted as a space-separated string.
 MATCHER_P(EqCapabilities, expected_capabilities, "") {
   if (!arg.has_capabilities())
     return false;
 
   std::vector<std::string> words_args;
   std::vector<std::string> words_expected;
   Tokenize(arg.capabilities(), " ", &words_args);
   Tokenize(expected_capabilities, " ", &words_expected);
@@ skipping 262 matching lines @@
   EXPECT_CALL(session_event_handler_, OnSessionClosed(_))
       .InSequence(s);
 
   // This event should not get through to the clipboard stub,
   // because the client isn't authenticated yet.
   connection_->clipboard_stub()->InjectClipboardEvent(clipboard_event1);
 
   ConnectClientSession();
 }
 
-namespace {
-
-MATCHER_P2(EqualsUsbEvent, usb_keycode, pressed, "") {
-  return arg.usb_keycode() == (unsigned int)usb_keycode &&
-         arg.pressed() == pressed;
-}
-
-MATCHER_P2(EqualsMouseEvent, x, y, "") {
-  return arg.x() == x && arg.y() == y;
-}
-
-MATCHER_P2(EqualsMouseButtonEvent, button, down, "") {
-  return arg.button() == button && arg.button_down() == down;
-}
-
-}  // namespace
-
 TEST_F(ClientSessionTest, InputStubFilter) {
   CreateClientSession();
 
   protocol::KeyEvent key_event1;
   key_event1.set_pressed(true);
   key_event1.set_usb_keycode(1);
 
   protocol::KeyEvent key_event2_down;
   key_event2_down.set_pressed(true);
   key_event2_down.set_usb_keycode(2);
@@ skipping 401 matching lines @@
 
   DisconnectClientSession();
   StopClientSession();
 
   // ext1 was instantiated and wrapped the video capturer.
   EXPECT_TRUE(extension.was_instantiated());
   EXPECT_TRUE(extension.has_wrapped_video_capturer());
 }
 
 }  // namespace remoting