| Index: ui/app_list/shower/test/run_all_unittests.cc
|
| diff --git a/ui/keyboard/test/run_all_unittests.cc b/ui/app_list/shower/test/run_all_unittests.cc
|
| similarity index 71%
|
| copy from ui/keyboard/test/run_all_unittests.cc
|
| copy to ui/app_list/shower/test/run_all_unittests.cc
|
| index 201b438e75a9d6ecb8d53b27cc9aa8dc9d1d4a22..880399bdfb784225ebd7cf83db4a251a1f577648 100644
|
| --- a/ui/keyboard/test/run_all_unittests.cc
|
| +++ b/ui/app_list/shower/test/run_all_unittests.cc
|
| @@ -1,9 +1,8 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| +// Copyright 2016 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.
|
|
|
| #include "base/bind.h"
|
| -#include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| #include "base/path_service.h"
|
| #include "base/test/launcher/unit_test_launcher.h"
|
| @@ -15,14 +14,14 @@
|
|
|
| namespace {
|
|
|
| -class KeyboardTestSuite : public base::TestSuite {
|
| +class AppListShowerTestSuite : public base::TestSuite {
|
| public:
|
| - KeyboardTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
|
| + AppListShowerTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
|
|
|
| protected:
|
| void Initialize() override {
|
| - base::TestSuite::Initialize();
|
| gfx::GLSurfaceTestSupport::InitializeOneOff();
|
| + base::TestSuite::Initialize();
|
| ui::RegisterPathProvider();
|
|
|
| base::FilePath ui_test_pak_path;
|
| @@ -36,16 +35,15 @@ class KeyboardTestSuite : public base::TestSuite {
|
| }
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(KeyboardTestSuite);
|
| + DISALLOW_COPY_AND_ASSIGN(AppListShowerTestSuite);
|
| };
|
|
|
| } // namespace
|
|
|
| int main(int argc, char** argv) {
|
| - KeyboardTestSuite test_suite(argc, argv);
|
| + AppListShowerTestSuite test_suite(argc, argv);
|
|
|
| return base::LaunchUnitTests(
|
| - argc,
|
| - argv,
|
| - base::Bind(&KeyboardTestSuite::Run, base::Unretained(&test_suite)));
|
| + argc, argv,
|
| + base::Bind(&AppListShowerTestSuite::Run, base::Unretained(&test_suite)));
|
| }
|
|
|