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

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

Issue 218613010: Mojo: Move mojo/public/bindings/*.h to mojo/public/cpp/bindings/*.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "content/browser/webui/web_ui_controller_factory_registry.h" 11 #include "content/browser/webui/web_ui_controller_factory_registry.h"
12 #include "content/common/mojo/mojo_channel_init.h" 12 #include "content/common/mojo/mojo_channel_init.h"
13 #include "content/public/browser/browser_context.h" 13 #include "content/public/browser/browser_context.h"
14 #include "content/public/browser/render_view_host.h" 14 #include "content/public/browser/render_view_host.h"
15 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
16 #include "content/public/browser/web_ui_controller.h" 16 #include "content/public/browser/web_ui_controller.h"
17 #include "content/public/browser/web_ui_data_source.h" 17 #include "content/public/browser/web_ui_data_source.h"
18 #include "content/public/common/content_paths.h" 18 #include "content/public/common/content_paths.h"
19 #include "content/public/common/content_switches.h" 19 #include "content/public/common/content_switches.h"
20 #include "content/public/common/url_utils.h" 20 #include "content/public/common/url_utils.h"
21 #include "content/public/test/content_browser_test.h" 21 #include "content/public/test/content_browser_test.h"
22 #include "content/public/test/content_browser_test_utils.h" 22 #include "content/public/test/content_browser_test_utils.h"
23 #include "content/test/data/web_ui_test_mojo_bindings.mojom.h" 23 #include "content/test/data/web_ui_test_mojo_bindings.mojom.h"
24 #include "grit/content_resources.h" 24 #include "grit/content_resources.h"
25 #include "mojo/public/bindings/js/constants.h" 25 #include "mojo/public/bindings/js/constants.h"
26 #include "mojo/public/bindings/remote_ptr.h" 26 #include "mojo/public/cpp/bindings/remote_ptr.h"
27 27
28 namespace content { 28 namespace content {
29 namespace { 29 namespace {
30 30
31 bool got_message = false; 31 bool got_message = false;
32 32
33 // Returns the path to the mojom js bindings file. 33 // Returns the path to the mojom js bindings file.
34 base::FilePath GetFilePathForJSResource(const std::string& path) { 34 base::FilePath GetFilePathForJSResource(const std::string& path) {
35 std::string binding_path = "gen/" + path + ".js"; 35 std::string binding_path = "gen/" + path + ".js";
36 #if defined(OS_WIN) 36 #if defined(OS_WIN)
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 factory()->set_run_loop(&run_loop); 188 factory()->set_run_loop(&run_loop);
189 GURL test_url(test_server()->GetURL("files/web_ui_mojo.html")); 189 GURL test_url(test_server()->GetURL("files/web_ui_mojo.html"));
190 NavigateToURL(shell(), test_url); 190 NavigateToURL(shell(), test_url);
191 // RunLoop is quit when message received from page. 191 // RunLoop is quit when message received from page.
192 run_loop.Run(); 192 run_loop.Run();
193 EXPECT_TRUE(got_message); 193 EXPECT_TRUE(got_message);
194 } 194 }
195 195
196 } // namespace 196 } // namespace
197 } // namespace content 197 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_process_host_mojo_impl.h ('k') | content/renderer/mojo/mojo_render_process_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698