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

Side by Side 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, 3 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 | « no previous file | content/app/mojo/mojo_init.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/public/test/content_browser_test.h" 5 #include "content/public/test/content_browser_test.h"
6 #include "mojo/application_manager/application_manager.h" 6 #include "mojo/public/c/system/core.h"
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 8
9 namespace content { 9 namespace content {
10 10
11 class MojoTest : public ContentBrowserTest { 11 class MojoTest : public ContentBrowserTest {
12 public: 12 public:
13 MojoTest() {} 13 MojoTest() {}
14 14
15 protected: 15 protected:
16 bool HasCreatedInstance() { 16 bool IsMojoInitialized() {
17 return mojo::ApplicationManager::TestAPI::HasCreatedInstance(); 17 // Check |MojoGetTimeTicksNow()| is accessible.
18 MojoGetTimeTicksNow();
19 return true;
18 } 20 }
19 21
20 private: 22 private:
21 DISALLOW_COPY_AND_ASSIGN(MojoTest); 23 DISALLOW_COPY_AND_ASSIGN(MojoTest);
22 }; 24 };
23 25
24 // Placeholder test to confirm we are initializing Mojo. 26 // Placeholder test to confirm we are initializing Mojo.
25 IN_PROC_BROWSER_TEST_F(MojoTest, Init) { 27 IN_PROC_BROWSER_TEST_F(MojoTest, Init) {
26 EXPECT_TRUE(HasCreatedInstance()); 28 EXPECT_TRUE(IsMojoInitialized());
27 } 29 }
28 30
29 } // namespace content 31 } // namespace content
OLDNEW
« 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