base/testutils.h: Use namespace webrtc::testing instead of plain testing

webrtc/base/testutils.h

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 19 matching lines @@
 #include "webrtc/base/asyncsocket.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/nethelpers.h"
 #include "webrtc/base/pathutils.h"
 #include "webrtc/base/stream.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/base/thread.h"
 
+namespace webrtc {
 namespace testing {
 
 using namespace rtc;
 
 ///////////////////////////////////////////////////////////////////////////////
 // StreamSink - Monitor asynchronously signalled events from StreamInterface
 // or AsyncSocket (which should probably be a StreamInterface.
 ///////////////////////////////////////////////////////////////////////////////
 
 // Note: Any event that is an error is treaded as SSE_ERROR instead of that
@@ skipping 363 matching lines @@
   }
 
   std::unique_ptr<AsyncSocket> socket_;
   std::vector<SocketTestClient*> clients_;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // Unittest predicates which are similar to STREQ, but for raw memory
 ///////////////////////////////////////////////////////////////////////////////
 
-inline AssertionResult CmpHelperMemEq(const char* expected_expression,
-                                      const char* expected_length_expression,
-                                      const char* actual_expression,
-                                      const char* actual_length_expression,
-                                      const void* expected,
-                                      size_t expected_length,
-                                      const void* actual,
-                                      size_t actual_length)
-{
+inline ::testing::AssertionResult CmpHelperMemEq(
+    const char* expected_expression,
+    const char* expected_length_expression,
+    const char* actual_expression,
+    const char* actual_length_expression,
+    const void* expected,
+    size_t expected_length,
+    const void* actual,
+    size_t actual_length) {
   if ((expected_length == actual_length)
       && (0 == memcmp(expected, actual, expected_length))) {
-    return AssertionSuccess();
+    return ::testing::AssertionSuccess();
   }
 
-  Message msg;
+  ::testing::Message msg;
   msg << "Value of: " << actual_expression
       << " [" << actual_length_expression << "]";
   if (true) {  //!actual_value.Equals(actual_expression)) {
     size_t buffer_size = actual_length * 2 + 1;
     char* buffer = STACK_ARRAY(char, buffer_size);
     hex_encode(buffer, buffer_size,
                reinterpret_cast<const char*>(actual), actual_length);
     msg << "\n  Actual: " << buffer << " [" << actual_length << "]";
   }
 
@@ skipping 103 matching lines @@
       major_version < 1 ||
       (major_version < 2 && minor_version < 3)) {
     LOG(LS_WARNING) << "XRandr version: " << major_version << "."
                     << minor_version;
     LOG(LS_WARNING) << "XRandr is not supported or is too old (pre 1.3).";
     return false;
   }
 #endif
   return true;
 }
+
 }  // namespace testing
+}  // namespace webrtc
 
 #endif  // WEBRTC_BASE_TESTUTILS_H__