Move calling of shared browser test methods like SetUpOnMainThread/TearDownOnMainThread/RunTestOn...

content/public/test/browser_test_base.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_
 #define CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/threading/thread.h"
@@ skipping 49 matching lines @@
   // to do what you want by overriding it and calling the superclass version.
   //
   // Override this for things you would normally override SetUp for. It will be
   // called before your individual test fixture method is run, but after most
   // of the overhead initialization has occured.
   virtual void SetUpInProcessBrowserTestFixture() {}
 
   // Override this for things you would normally override TearDown for.
   virtual void TearDownInProcessBrowserTestFixture() {}
 
+  // This is invoked from main after browser_init/browser_main have completed.
+  // This prepares for the test by creating a new browser and doing any other
+  // initialization.
+  // This is meant to be inherited only by the test harness.
+  virtual void PreRunTestOnMainThread() = 0;
+
   // Override this rather than TestBody.
+  // Note this is internally called by the browser test macros.
   virtual void RunTestOnMainThread() = 0;
 
-  // This is invoked from main after browser_init/browser_main have completed.
-  // This prepares for the test by creating a new browser, runs the test
-  // (RunTestOnMainThread), quits the browsers and returns.
-  virtual void RunTestOnMainThreadLoop() = 0;
+  // This is invoked from main after RunTestOnMainThread has run, to give the
+  // harness a chance for post-test cleanup.
+  // This is meant to be inherited only by the test harness.
+  virtual void PostRunTestOnMainThread() = 0;
 
   // Sets expected browser exit code, in case it's different than 0 (success).
   void set_expected_exit_code(int code) { expected_exit_code_ = code; }
 
   const net::SpawnedTestServer* spawned_test_server() const {
     return spawned_test_server_.get();
   }
   net::SpawnedTestServer* spawned_test_server() {
     return spawned_test_server_.get();
   }
@@ skipping 30 matching lines @@
   // Call this before SetUp() to cause the test to generate pixel output.
   void EnablePixelOutput();
 
   // Call this before SetUp() to not use GL, but use software compositing
   // instead.
   void UseSoftwareCompositing();
 
   // Returns true if the test will be using GL acceleration via a software GL.
   bool UsingSoftwareGL() const;
 
+  // Temporary
+  // TODO(jam): remove this.
+  void disable_io_checks() { disable_io_checks_ = true; }
+
  private:
   void ProxyRunTestOnMainThreadLoop();
 
   // Testing server, started on demand.
   std::unique_ptr<net::SpawnedTestServer> spawned_test_server_;
 
   // Embedded test server, cheap to create, started on demand.
   std::unique_ptr<net::EmbeddedTestServer> embedded_test_server_;
 
   // Host resolver used during tests.
   scoped_refptr<net::RuleBasedHostResolverProc> rule_based_resolver_;
 
   // Expected exit code (default is 0).
   int expected_exit_code_;
 
   // When true, the compositor will produce pixel output that can be read back
   // for pixel tests.
   bool enable_pixel_output_;
 
   // When true, do compositing with the software backend instead of using GL.
   bool use_software_compositing_;
 
   // Whether SetUp was called. This value is checked in the destructor of this
   // class to ensure that SetUp was called. If it's not called, the test will
   // not run and report a false positive result.
   bool set_up_called_;
 
+  // Tests should keep on the IO thread checks to test that production code
+  // paths don't make file access. Keep this for now since src/chrome didn't
+  // check this.
+  bool disable_io_checks_;
+
 #if defined(OS_POSIX)
   bool handle_sigterm_;
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_