Chromium Code Reviews| Index: ui/ozone/run_all_unittests.cc |
| diff --git a/extensions/test/extensions_unittests_main.cc b/ui/ozone/run_all_unittests.cc |
| similarity index 52% |
| copy from extensions/test/extensions_unittests_main.cc |
| copy to ui/ozone/run_all_unittests.cc |
| index 78b0a8d17722f79a8c358206e6f4dbe78ec15454..32270992bb7b7f844a000e41bf2b611eb6f6654a 100644 |
| --- a/extensions/test/extensions_unittests_main.cc |
| +++ b/ui/ozone/run_all_unittests.cc |
| @@ -3,48 +3,43 @@ |
| // found in the LICENSE file. |
| #include "base/bind.h" |
| -#include "base/macros.h" |
| #include "base/test/launcher/unit_test_launcher.h" |
| #include "base/test/test_suite.h" |
| -#include "extensions/test/test_extensions_client.h" |
| +#include "build/build_config.h" |
| namespace { |
| -class ExtensionsTestSuite : public base::TestSuite { |
| +class OzoneTestSuite : public base::TestSuite { |
| public: |
| - ExtensionsTestSuite(int argc, char** argv); |
| + OzoneTestSuite(int argc, char** argv); |
| - private: |
| + protected: |
| // base::TestSuite: |
| virtual void Initialize() OVERRIDE; |
| virtual void Shutdown() OVERRIDE; |
| - scoped_ptr<extensions::TestExtensionsClient> client_; |
| - |
| - DISALLOW_COPY_AND_ASSIGN(ExtensionsTestSuite); |
| + private: |
| + DISALLOW_COPY_AND_ASSIGN(OzoneTestSuite); |
| }; |
| -ExtensionsTestSuite::ExtensionsTestSuite(int argc, char** argv) |
| +OzoneTestSuite::OzoneTestSuite(int argc, char** argv) |
| : base::TestSuite(argc, argv) {} |
| -void ExtensionsTestSuite::Initialize() { |
| +void OzoneTestSuite::Initialize() { |
| base::TestSuite::Initialize(); |
| - |
| - client_.reset(new extensions::TestExtensionsClient()); |
| - extensions::ExtensionsClient::Set(client_.get()); |
| } |
| -void ExtensionsTestSuite::Shutdown() { |
| +void OzoneTestSuite::Shutdown() { |
| base::TestSuite::Shutdown(); |
| } |
| } // namespace |
| int main(int argc, char** argv) { |
| - ExtensionsTestSuite test_suite(argc, argv); |
| + OzoneTestSuite test_suite(argc, argv); |
| return base::LaunchUnitTests(argc, |
| argv, |
| - base::Bind(&ExtensionsTestSuite::Run, |
| + base::Bind(&OzoneTestSuite::Run, |
| base::Unretained(&test_suite))); |
| } |
|
rjkroege
2014/05/30 15:57:49
all the bad parts of lisp without the good bits. :
spang
2014/05/30 16:47:01
Done.
|