content/browser/webui/web_ui_mojo_browsertest.cc - Issue 495423004: Cleanup: Remove unneeded references to content_resources.gyp:content_resources.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 495423004: Cleanup: Remove unneeded references to content_resources.gyp:content_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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 | « components/components_tests.gyp ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

OLD	NEW
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"

15 #include "content/public/browser/browser_context.h"	14 #include "content/public/browser/browser_context.h"

16 #include "content/public/browser/render_frame_host.h"	15 #include "content/public/browser/render_frame_host.h"

17 #include "content/public/browser/render_process_host.h"	16 #include "content/public/browser/render_process_host.h"

18 #include "content/public/browser/render_view_host.h"	17 #include "content/public/browser/render_view_host.h"

19 #include "content/public/browser/web_contents.h"	18 #include "content/public/browser/web_contents.h"

20 #include "content/public/browser/web_ui_controller.h"	19 #include "content/public/browser/web_ui_controller.h"

21 #include "content/public/browser/web_ui_data_source.h"	20 #include "content/public/browser/web_ui_data_source.h"

22 #include "content/public/common/content_paths.h"	21 #include "content/public/common/content_paths.h"

23 #include "content/public/common/content_switches.h"	22 #include "content/public/common/content_switches.h"

24 #include "content/public/common/service_registry.h"	23 #include "content/public/common/service_registry.h"

(...skipping 205 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
230 NavigateToURL(other_shell, test_url);	229 NavigateToURL(other_shell, test_url);

231 // RunLoop is quit when message received from page.	230 // RunLoop is quit when message received from page.

232 other_run_loop.Run();	231 other_run_loop.Run();

233 EXPECT_TRUE(got_message);	232 EXPECT_TRUE(got_message);

234 EXPECT_EQ(shell()->web_contents()->GetRenderProcessHost(),	233 EXPECT_EQ(shell()->web_contents()->GetRenderProcessHost(),

235 other_shell->web_contents()->GetRenderProcessHost());	234 other_shell->web_contents()->GetRenderProcessHost());

236 }	235 }

237	236

238 } // namespace	237 } // namespace

239 } // namespace content	238 } // namespace content

OLD	NEW