diff options
author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 12:46:38 +0000 |
---|---|---|
committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 12:46:38 +0000 |
commit | f0a51fb571f46531025fa09240bbc3e1af925e84 (patch) | |
tree | 558b4f0e737fda4b9ab60f252c9c23b8a4ca523e /testing | |
parent | 6390be368205705f49ead3cec40396519f13b889 (diff) | |
download | chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.zip chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.tar.gz chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.tar.bz2 |
Fixes CRLF and trailing white spaces.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
-rw-r--r-- | testing/multiprocess_func_list.cc | 10 | ||||
-rw-r--r-- | testing/multiprocess_func_list.h | 6 | ||||
-rw-r--r-- | testing/platform_test.h | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/testing/multiprocess_func_list.cc b/testing/multiprocess_func_list.cc index 236edbf..1e19704 100644 --- a/testing/multiprocess_func_list.cc +++ b/testing/multiprocess_func_list.cc @@ -9,20 +9,20 @@ // Helper functions to maintain mapping of "test name"->test func. // The information is accessed via a global map. namespace multi_process_function_list { - + namespace { typedef std::map<std::string, ChildFunctionPtr> MultiProcessTestMap; - + // Retrieve a reference to the global 'func name' -> func ptr map. MultiProcessTestMap &GetMultiprocessFuncMap() { static MultiProcessTestMap test_name_to_func_ptr_map; return test_name_to_func_ptr_map; } - + } // namespace -AppendMultiProcessTest::AppendMultiProcessTest(std::string test_name, +AppendMultiProcessTest::AppendMultiProcessTest(std::string test_name, ChildFunctionPtr func_ptr) { GetMultiprocessFuncMap()[test_name] = func_ptr; } @@ -36,7 +36,7 @@ int InvokeChildProcessTest(std::string test_name) { return (*func)(); } } - + return -1; } diff --git a/testing/multiprocess_func_list.h b/testing/multiprocess_func_list.h index 0d53b2b..6ba8495 100644 --- a/testing/multiprocess_func_list.h +++ b/testing/multiprocess_func_list.h @@ -11,7 +11,7 @@ // as the main function of a child process in a multi-process test. // This complements the MultiProcessTest class which provides facilities // for launching such tests. -// +// // The MULTIPROCESS_TEST_MAIN() macro registers a string -> func_ptr mapping // by creating a new global instance of the AppendMultiProcessTest() class // this means that by the time that we reach our main() function the mapping @@ -32,13 +32,13 @@ namespace multi_process_function_list { typedef int (*ChildFunctionPtr)(); // Helper class to append a test function to the global mapping. -// Used by the MULTIPROCESS_TEST_MAIN macro. +// Used by the MULTIPROCESS_TEST_MAIN macro. class AppendMultiProcessTest { public: AppendMultiProcessTest(std::string test_name, ChildFunctionPtr func_ptr); }; -// Invoke the main function of a test previously registered with +// Invoke the main function of a test previously registered with // MULTIPROCESS_TEST_MAIN() int InvokeChildProcessTest(std::string test_name); diff --git a/testing/platform_test.h b/testing/platform_test.h index 6e5e039..991ad09 100644 --- a/testing/platform_test.h +++ b/testing/platform_test.h @@ -20,7 +20,7 @@ class NSAutoreleasePool; // only implemented on the Mac. To enable this for another platform, just // adjust the #ifdefs and add a platform_test_<platform>.cc implementation file. class PlatformTest : public testing::Test { - protected: + protected: virtual void SetUp(); virtual void TearDown(); |