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

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

Issue 492813002: Use a qualified path for grit/content_resources.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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
« no previous file with comments | « content/browser/webui/web_ui_data_source_impl.cc ('k') | content/common/sandbox_mac.mm » ('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 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "content/browser/webui/web_ui_controller_factory_registry.h" 13 #include "content/browser/webui/web_ui_controller_factory_registry.h"
14 #include "content/grit/content_resources.h"
14 #include "content/public/browser/browser_context.h" 15 #include "content/public/browser/browser_context.h"
15 #include "content/public/browser/render_frame_host.h" 16 #include "content/public/browser/render_frame_host.h"
16 #include "content/public/browser/render_process_host.h" 17 #include "content/public/browser/render_process_host.h"
17 #include "content/public/browser/render_view_host.h" 18 #include "content/public/browser/render_view_host.h"
18 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
19 #include "content/public/browser/web_ui_controller.h" 20 #include "content/public/browser/web_ui_controller.h"
20 #include "content/public/browser/web_ui_data_source.h" 21 #include "content/public/browser/web_ui_data_source.h"
21 #include "content/public/common/content_paths.h" 22 #include "content/public/common/content_paths.h"
22 #include "content/public/common/content_switches.h" 23 #include "content/public/common/content_switches.h"
23 #include "content/public/common/service_registry.h" 24 #include "content/public/common/service_registry.h"
24 #include "content/public/common/url_utils.h" 25 #include "content/public/common/url_utils.h"
25 #include "content/public/test/content_browser_test.h" 26 #include "content/public/test/content_browser_test.h"
26 #include "content/public/test/content_browser_test_utils.h" 27 #include "content/public/test/content_browser_test_utils.h"
27 #include "content/shell/browser/shell.h" 28 #include "content/shell/browser/shell.h"
28 #include "content/test/data/web_ui_test_mojo_bindings.mojom.h" 29 #include "content/test/data/web_ui_test_mojo_bindings.mojom.h"
29 #include "grit/content_resources.h"
30 #include "mojo/common/test/test_utils.h" 30 #include "mojo/common/test/test_utils.h"
31 #include "mojo/public/cpp/bindings/interface_impl.h" 31 #include "mojo/public/cpp/bindings/interface_impl.h"
32 #include "mojo/public/cpp/bindings/interface_request.h" 32 #include "mojo/public/cpp/bindings/interface_request.h"
33 #include "mojo/public/js/bindings/constants.h" 33 #include "mojo/public/js/bindings/constants.h"
34 34
35 namespace content { 35 namespace content {
36 namespace { 36 namespace {
37 37
38 bool got_message = false; 38 bool got_message = false;
39 39
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 NavigateToURL(other_shell, test_url); 230 NavigateToURL(other_shell, test_url);
231 // RunLoop is quit when message received from page. 231 // RunLoop is quit when message received from page.
232 other_run_loop.Run(); 232 other_run_loop.Run();
233 EXPECT_TRUE(got_message); 233 EXPECT_TRUE(got_message);
234 EXPECT_EQ(shell()->web_contents()->GetRenderProcessHost(), 234 EXPECT_EQ(shell()->web_contents()->GetRenderProcessHost(),
235 other_shell->web_contents()->GetRenderProcessHost()); 235 other_shell->web_contents()->GetRenderProcessHost());
236 } 236 }
237 237
238 } // namespace 238 } // namespace
239 } // namespace content 239 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/webui/web_ui_data_source_impl.cc ('k') | content/common/sandbox_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698