Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Side by Side Diff: components/html_viewer/run_all_unittests.cc

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/html_viewer/DEPS ('k') | components/mus/public/cpp/tests/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <vector> 5 #include <vector>
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/test/launcher/unit_test_launcher.h" 10 #include "base/test/launcher/unit_test_launcher.h"
11 #include "base/test/test_io_thread.h"
11 #include "base/test/test_suite.h" 12 #include "base/test/test_suite.h"
12 #include "build/build_config.h" 13 #include "build/build_config.h"
13 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" 14 #include "mojo/edk/embedder/embedder.h"
14 #include "ui/base/resource/resource_bundle.h" 15 #include "ui/base/resource/resource_bundle.h"
15 #include "ui/gfx/display.h" 16 #include "ui/gfx/display.h"
16 #include "ui/gfx/geometry/size.h" 17 #include "ui/gfx/geometry/size.h"
17 #include "ui/mojo/init/ui_init.h" 18 #include "ui/mojo/init/ui_init.h"
18 19
19 #if defined(OS_ANDROID) 20 #if defined(OS_ANDROID)
20 #include "base/android/apk_assets.h" 21 #include "base/android/apk_assets.h"
21 #include "base/android/jni_android.h" 22 #include "base/android/jni_android.h"
22 #include "base/test/test_file_util.h" 23 #include "base/test/test_file_util.h"
23 #endif 24 #endif
(...skipping 21 matching lines...) Expand all
45 ui::ResourceBundle::InitSharedInstanceWithPakPath(base::FilePath()); 46 ui::ResourceBundle::InitSharedInstanceWithPakPath(base::FilePath());
46 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion( 47 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion(
47 base::File(fd), resource_file_region, ui::SCALE_FACTOR_100P); 48 base::File(fd), resource_file_region, ui::SCALE_FACTOR_100P);
48 #else 49 #else
49 base::FilePath pak_path; 50 base::FilePath pak_path;
50 CHECK(PathService::Get(base::DIR_MODULE, &pak_path)); 51 CHECK(PathService::Get(base::DIR_MODULE, &pak_path));
51 pak_path = pak_path.AppendASCII("html_viewer.pak"); 52 pak_path = pak_path.AppendASCII("html_viewer.pak");
52 ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_path); 53 ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_path);
53 #endif 54 #endif
54 ui::mojo::UIInit ui_init(GetTestDisplays()); 55 ui::mojo::UIInit ui_init(GetTestDisplays());
55 mojo::embedder::Init(); 56 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
57 mojo::edk::Init(test_io_thread.task_runner());
56 58
57 return base::LaunchUnitTests( 59 return base::LaunchUnitTests(
58 argc, argv, 60 argc, argv,
59 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); 61 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
60 } 62 }
OLDNEW
« no previous file with comments | « components/html_viewer/DEPS ('k') | components/mus/public/cpp/tests/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698