Add (not yet working) content_browsertests target.

content/test/browser_test.h

Index: content/test/browser_test.h
===================================================================
--- content/test/browser_test.h	(revision 0)
+++ content/test/browser_test.h	(revision 0)
@@ -0,0 +1,85 @@
+// Copyright (c) 2011 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 CONTENT_TEST_BROWSER_TEST_H_
+#define CONTENT_TEST_BROWSER_TEST_H_
+#pragma once
+
+// We only want to use InProcessBrowserTest in test targets which properly
+// isolate each test case by running each test in a separate process.
+// This way if a test hangs the test launcher can reliably terminate it.
+//
+// InProcessBrowserTest cannot be run more than once in the same address space
+// anyway - otherwise the second test crashes.
+#if defined(HAS_OUT_OF_PROC_TEST_RUNNER)
+
+#if defined(BROWSER_TESTS_USE_CONTENT)

[jam, 2011/09/27 19:11:35]

instead of having each test binary having to define a macro, and the code in
content to hardcode a mapping from that macro to a header to include, why not
have the macro be the source to the header?

[Paweł Hajdan Jr., 2011/09/27 20:05:18]

Do you mean something like:

defines: [
  'BROWSER_TESTS_HEADER': 'chrome/test/base/in_process_browser_test.h'
]

? I thought about this, but the macros are also used in
out_of_proc_test_runner.cc to exclude chrome-specific code. I'd like to get rid
of those chrome-specific bits, but it'd probably need more of the content shell
in place.

+#include "content/test/content_browser_test.h"
+typedef ContentBrowserTest InProcessBrowserTest;
+#elif defined(BROWSER_TESTS_USE_CHROME)
+#include "chrome/test/base/in_process_browser_test.h"
+#else
+#error Please define BROWSER_TESTS_USE_CONTENT or BROWSER_TESTS_USE_CHROME
+#endif
+
+#define IN_PROC_BROWSER_TEST_(test_case_name, test_name, parent_class,\
+                              parent_id)\
+class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) : public parent_class {\
+ public:\
+  GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {}\
+ protected:\
+  virtual void RunTestOnMainThread();\
+ private:\
+  virtual void TestBody() {}\
+  static ::testing::TestInfo* const test_info_;\
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(\
+      GTEST_TEST_CLASS_NAME_(test_case_name, test_name));\
+};\
+\
+::testing::TestInfo* const GTEST_TEST_CLASS_NAME_(test_case_name, test_name)\
+  ::test_info_ =\
+    ::testing::internal::MakeAndRegisterTestInfo(\
+        #test_case_name, #test_name, "", "", \
+        (parent_id), \
+        parent_class::SetUpTestCase, \
+        parent_class::TearDownTestCase, \
+        new ::testing::internal::TestFactoryImpl<\
+            GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>);\
+void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::RunTestOnMainThread()
+
+#define IN_PROC_BROWSER_TEST_F(test_fixture, test_name)\
+  IN_PROC_BROWSER_TEST_(test_fixture, test_name, test_fixture,\
+                    ::testing::internal::GetTypeId<test_fixture>())
+
+#define IN_PROC_BROWSER_TEST_P(test_case_name, test_name) \
+  class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \
+      : public test_case_name { \
+   public: \
+    GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {} \
+   protected: \
+    virtual void RunTestOnMainThread(); \
+   private: \
+    virtual void TestBody() {} \
+    static int AddToRegistry() { \
+      ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
+          GetTestCasePatternHolder<test_case_name>(\
+              #test_case_name, __FILE__, __LINE__)->AddTestPattern(\
+                  #test_case_name, \
+                  #test_name, \
+                  new ::testing::internal::TestMetaFactory< \
+                      GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>()); \
+      return 0; \
+    } \
+    static int gtest_registering_dummy_; \
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(\
+        GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \
+  }; \
+  int GTEST_TEST_CLASS_NAME_(test_case_name, \
+                             test_name)::gtest_registering_dummy_ = \
+      GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::AddToRegistry(); \
+  void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::RunTestOnMainThread()
+
+#endif  // defined(HAS_OUT_OF_PROC_TEST_RUNNER)
+
+#endif  // CONTENT_TEST_BROWSER_TEST_H_
Property changes on: content\test\browser_test.h
___________________________________________________________________
Added: svn:eol-style
   + LF