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

Unified Diff: content/app/mojo/mojo_browsertest.cc

Issue 531513003: Do not initialize an ApplicationManager in chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/app/mojo/mojo_init.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/app/mojo/mojo_browsertest.cc
diff --git a/content/app/mojo/mojo_browsertest.cc b/content/app/mojo/mojo_browsertest.cc
index 17b869b99444cce2bbfe53f242938ae1c637941f..b516107333f4f36104dc1a3170eddc998554d019 100644
--- a/content/app/mojo/mojo_browsertest.cc
+++ b/content/app/mojo/mojo_browsertest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "content/public/test/content_browser_test.h"
-#include "mojo/application_manager/application_manager.h"
+#include "mojo/public/c/system/core.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace content {
@@ -13,8 +13,10 @@ class MojoTest : public ContentBrowserTest {
MojoTest() {}
protected:
- bool HasCreatedInstance() {
- return mojo::ApplicationManager::TestAPI::HasCreatedInstance();
+ bool IsMojoInitialized() {
+ // Check |MojoGetTimeTicksNow()| is accessible.
+ MojoGetTimeTicksNow();
+ return true;
}
private:
@@ -23,7 +25,7 @@ class MojoTest : public ContentBrowserTest {
// Placeholder test to confirm we are initializing Mojo.
IN_PROC_BROWSER_TEST_F(MojoTest, Init) {
- EXPECT_TRUE(HasCreatedInstance());
+ EXPECT_TRUE(IsMojoInitialized());
}
} // namespace content
« no previous file with comments | « no previous file | content/app/mojo/mojo_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698