Add NSLogTestEventListener to support running tests on iOS 6 devices.

base/test/test_listener_ios.mm

 // 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 "base/test/test_listener_ios.h"
 
 #import <Foundation/Foundation.h>
 
+#include "base/ios/ios_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
+#include "base/test/nslog_test_event_listener.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // The iOS watchdog timer will kill an app that doesn't spin the main event
 // loop often enough. This uses a Gtest TestEventListener to spin the current
 // loop after each test finishes. However, if any individual test takes too
 // long, it is still possible that the app will get killed.
 
 namespace {
 
 class IOSRunLoopListener : public testing::EmptyTestEventListener {
@@ skipping 14 matching lines @@
 
 namespace base {
 namespace test_listener_ios {
 
 void RegisterTestEndListener() {
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new IOSRunLoopListener);
 }
 
+// Only add the NSLogTestEventListener when running on a device with iOS 6 or
+// later.
+void RegisterNSLogListenerIfNecessary() {
+#if !TARGET_IPHONE_SIMULATOR
+  NSLog(@"Running on a device");
+  if (ios::IsRunningOnIOS6OrLater()) {
+    testing::TestEventListeners& listeners =
+        testing::UnitTest::GetInstance()->listeners();
+    listeners.Append(new NSLogTestEventListener);
+  }
+#endif
+}
+
 }  // namespace test_listener_ios
 }  // namespace base