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

Side by Side Diff: mojo/application/public/cpp/lib/application_test_base.cc

Issue 1141153002: Fix build after r329965. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | no next file » | 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 "mojo/public/cpp/application/application_test_base.h" 5 #include "mojo/application/public/cpp/application_test_base.h"
6 6
7 #include "mojo/application/public/cpp/application_impl.h"
7 #include "mojo/application/public/interfaces/application.mojom.h" 8 #include "mojo/application/public/interfaces/application.mojom.h"
8 #include "mojo/public/cpp/application/application_impl.h"
9 #include "mojo/public/cpp/bindings/binding.h" 9 #include "mojo/public/cpp/bindings/binding.h"
10 #include "mojo/public/cpp/environment/environment.h" 10 #include "mojo/public/cpp/environment/environment.h"
11 #include "mojo/public/cpp/system/message_pipe.h" 11 #include "mojo/public/cpp/system/message_pipe.h"
12 12
13 namespace mojo { 13 namespace mojo {
14 namespace test { 14 namespace test {
15 15
16 namespace { 16 namespace {
17 // Share the application command-line arguments with multiple application tests. 17 // Share the application command-line arguments with multiple application tests.
18 Array<String> g_args; 18 Array<String> g_args;
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 if (ShouldCreateDefaultRunLoop()) 156 if (ShouldCreateDefaultRunLoop())
157 Environment::DestroyDefaultRunLoop(); 157 Environment::DestroyDefaultRunLoop();
158 } 158 }
159 159
160 bool ApplicationTestBase::ShouldCreateDefaultRunLoop() { 160 bool ApplicationTestBase::ShouldCreateDefaultRunLoop() {
161 return true; 161 return true;
162 } 162 }
163 163
164 } // namespace test 164 } // namespace test
165 } // namespace mojo 165 } // namespace mojo
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698