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

Side by Side Diff: mojo/shell/shell_apptest.cc

Issue 1057603003: Simplify mojo_shell since it's now only used for Mandoline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update scripts Created 5 years, 8 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 | « mojo/shell/native_application_support.cc ('k') | mojo/shell/switches.h » ('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 "base/base_paths.h" 5 #include "base/base_paths.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
11 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
12 #include "base/strings/stringprintf.h" 12 #include "base/strings/stringprintf.h"
13 #include "mojo/application/application_test_base_chromium.h"
13 #include "mojo/common/data_pipe_utils.h" 14 #include "mojo/common/data_pipe_utils.h"
14 #include "mojo/public/cpp/application/application_impl.h" 15 #include "mojo/public/cpp/application/application_impl.h"
15 #include "mojo/public/cpp/application/application_test_base.h"
16 #include "mojo/public/cpp/system/macros.h" 16 #include "mojo/public/cpp/system/macros.h"
17 #include "mojo/services/http_server/public/cpp/http_server_util.h" 17 #include "mojo/services/http_server/public/cpp/http_server_util.h"
18 #include "mojo/services/http_server/public/interfaces/http_server.mojom.h" 18 #include "mojo/services/http_server/public/interfaces/http_server.mojom.h"
19 #include "mojo/services/http_server/public/interfaces/http_server_factory.mojom. h" 19 #include "mojo/services/http_server/public/interfaces/http_server_factory.mojom. h"
20 #include "mojo/services/network/public/interfaces/net_address.mojom.h" 20 #include "mojo/services/network/public/interfaces/net_address.mojom.h"
21 #include "mojo/shell/kPingable.h" 21 #include "mojo/shell/kPingable.h"
22 #include "mojo/shell/test/pingable.mojom.h" 22 #include "mojo/shell/test/pingable.mojom.h"
23 23
24 namespace mojo { 24 namespace mojo {
25 namespace { 25 namespace {
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 EXPECT_EQ(app_url.To<std::string>() + "?foo", connection_url); 188 EXPECT_EQ(app_url.To<std::string>() + "?foo", connection_url);
189 EXPECT_EQ("hello", message); 189 EXPECT_EQ("hello", message);
190 base::MessageLoop::current()->Quit(); 190 base::MessageLoop::current()->Quit();
191 }; 191 };
192 pingable->Ping("hello", callback); 192 pingable->Ping("hello", callback);
193 base::RunLoop().Run(); 193 base::RunLoop().Run();
194 } 194 }
195 195
196 } // namespace 196 } // namespace
197 } // namespace mojo 197 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/shell/native_application_support.cc ('k') | mojo/shell/switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698