| Index: chromecast/app/cast_test_launcher.cc
|
| diff --git a/chromecast/browser/test/cast_test_launcher.cc b/chromecast/app/cast_test_launcher.cc
|
| similarity index 72%
|
| rename from chromecast/browser/test/cast_test_launcher.cc
|
| rename to chromecast/app/cast_test_launcher.cc
|
| index 2d3ae28b2a3fa703c6ba03727402bb2e257e4ae7..926b53708410680b680260adc3cf6edc92829d1b 100644
|
| --- a/chromecast/browser/test/cast_test_launcher.cc
|
| +++ b/chromecast/app/cast_test_launcher.cc
|
| @@ -2,18 +2,11 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include <memory>
|
| -
|
| -#include "base/bind.h"
|
| #include "base/macros.h"
|
| #include "base/sys_info.h"
|
| +#include "base/test/test_suite.h"
|
| #include "chromecast/app/cast_main_delegate.h"
|
| -#include "chromecast/base/cast_paths.h"
|
| -#include "content/public/test/content_test_suite_base.h"
|
| #include "content/public/test/test_launcher.h"
|
| -#include "ipc/ipc_channel.h"
|
| -#include "mojo/edk/embedder/embedder.h"
|
| -#include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace chromecast {
|
| namespace shell {
|
| @@ -48,8 +41,5 @@ class CastTestLauncherDelegate : public content::TestLauncherDelegate {
|
| int main(int argc, char** argv) {
|
| int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2);
|
| chromecast::shell::CastTestLauncherDelegate launcher_delegate;
|
| - chromecast::RegisterPathProvider();
|
| - mojo::edk::SetMaxMessageSize(IPC::Channel::kMaximumMessageSize);
|
| - mojo::edk::Init();
|
| - return LaunchTests(&launcher_delegate, default_jobs, argc, argv);
|
| + return content::LaunchTests(&launcher_delegate, default_jobs, argc, argv);
|
| }
|
|
|