Android: Refactor native test setup in a util class.

testing/android/native_test_util.h

Index: testing/android/native_test_util.h
diff --git a/testing/android/native_test_util.h b/testing/android/native_test_util.h
new file mode 100644
index 0000000000000000000000000000000000000000..a5840267cd6d49c6415977ca843760e313dbbb3b
--- /dev/null
+++ b/testing/android/native_test_util.h
@@ -0,0 +1,50 @@
+// Copyright (c) 2013 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 TESTING_ANDROID_NATIVE_TEST_UTIL_
+#define TESTING_ANDROID_NATIVE_TEST_UTIL_
+
+#include <stdio.h>
+#include <string>
+#include <vector>
+
+#include "base/basictypes.h"
+
+// This class has the helper methods for setting up environment for running
+// gtest tests inside an APK.
+namespace testing {
+
+class NativeTestUtil {

[Yaron, 2013/02/06 19:10:07]

Per style guide, I believe this should just be a namespace

[nilesh, 2013/02/06 19:31:19]

Done.

+ public:
+  NativeTestUtil();

[Yaron, 2013/02/06 19:10:07]

At a minimum, you could make the constructor private.

+  ~NativeTestUtil();
+
+  class ScopedMainEntryLogger {
+   public:
+    ScopedMainEntryLogger() {
+      printf(">>ScopedMainEntryLogger\n");
+    }
+
+    ~ScopedMainEntryLogger() {
+      printf("<<ScopedMainEntryLogger\n");
+      fflush(stdout);
+      fflush(stderr);
+    }
+  };
+
+  // Creates a fifo at the given |fifo_path|.
+  static void CreateFIFO(const char* fifo_path);
+  // Redirects the |stream| to the file provided by |path|.
+  static void RedirectStream(FILE* stream, const char* path, const char* mode);
+  static void ParseArgsFromCommandLineFile(
+      const char* path, std::vector<std::string>* args);
+  static int ArgsToArgv(const std::vector<std::string>& args,
+      std::vector<char*>* argv);
+ private:
+  DISALLOW_COPY_AND_ASSIGN(NativeTestUtil);
+};
+
+}  // namespace testing
+
+#endif  // TESTING_ANDROID_NATIVE_TEST_UTIL_