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

Side by Side Diff: content/browser/webui/web_ui_mojo_browsertest.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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 | « content/browser/websockets/websocket_manager.cc ('k') | content/child/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 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 <limits> 5 #include <limits>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 14 matching lines...) Expand all
25 #include "content/public/common/content_switches.h" 25 #include "content/public/common/content_switches.h"
26 #include "content/public/common/url_utils.h" 26 #include "content/public/common/url_utils.h"
27 #include "content/public/test/browser_test_utils.h" 27 #include "content/public/test/browser_test_utils.h"
28 #include "content/public/test/content_browser_test.h" 28 #include "content/public/test/content_browser_test.h"
29 #include "content/public/test/content_browser_test_utils.h" 29 #include "content/public/test/content_browser_test_utils.h"
30 #include "content/shell/browser/shell.h" 30 #include "content/shell/browser/shell.h"
31 #include "content/test/data/web_ui_test_mojo_bindings.mojom.h" 31 #include "content/test/data/web_ui_test_mojo_bindings.mojom.h"
32 #include "mojo/public/cpp/bindings/binding.h" 32 #include "mojo/public/cpp/bindings/binding.h"
33 #include "mojo/public/cpp/bindings/interface_request.h" 33 #include "mojo/public/cpp/bindings/interface_request.h"
34 #include "net/test/embedded_test_server/embedded_test_server.h" 34 #include "net/test/embedded_test_server/embedded_test_server.h"
35 #include "services/shell/public/cpp/interface_registry.h" 35 #include "services/service_manager/public/cpp/interface_registry.h"
36 36
37 namespace content { 37 namespace content {
38 namespace { 38 namespace {
39 39
40 bool g_got_message = false; 40 bool g_got_message = false;
41 41
42 base::FilePath GetFilePathForJSResource(const std::string& path) { 42 base::FilePath GetFilePathForJSResource(const std::string& path) {
43 base::ThreadRestrictions::ScopedAllowIO allow_io_from_test_callbacks; 43 base::ThreadRestrictions::ScopedAllowIO allow_io_from_test_callbacks;
44 44
45 std::string binding_path = "gen/" + path + ".js"; 45 std::string binding_path = "gen/" + path + ".js";
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 NavigateToURL(other_shell, test_url); 231 NavigateToURL(other_shell, test_url);
232 // RunLoop is quit when message received from page. 232 // RunLoop is quit when message received from page.
233 other_run_loop.Run(); 233 other_run_loop.Run();
234 EXPECT_TRUE(g_got_message); 234 EXPECT_TRUE(g_got_message);
235 EXPECT_EQ(shell()->web_contents()->GetRenderProcessHost(), 235 EXPECT_EQ(shell()->web_contents()->GetRenderProcessHost(),
236 other_shell->web_contents()->GetRenderProcessHost()); 236 other_shell->web_contents()->GetRenderProcessHost());
237 } 237 }
238 238
239 } // namespace 239 } // namespace
240 } // namespace content 240 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/websockets/websocket_manager.cc ('k') | content/child/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698