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

Side by Side Diff: content/shell/browser/layout_test/layout_test_content_browser_client.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/shell/browser/DEPS ('k') | content/shell/renderer/DEPS » ('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 "content/shell/browser/layout_test/layout_test_content_browser_client.h " 5 #include "content/shell/browser/layout_test/layout_test_content_browser_client.h "
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "content/public/browser/browser_context.h" 8 #include "content/public/browser/browser_context.h"
9 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
10 #include "content/public/browser/render_process_host.h" 10 #include "content/public/browser/render_process_host.h"
11 #include "content/public/browser/resource_dispatcher_host.h" 11 #include "content/public/browser/resource_dispatcher_host.h"
12 #include "content/public/browser/storage_partition.h" 12 #include "content/public/browser/storage_partition.h"
13 #include "content/shell/browser/layout_test/blink_test_controller.h" 13 #include "content/shell/browser/layout_test/blink_test_controller.h"
14 #include "content/shell/browser/layout_test/layout_test_bluetooth_fake_adapter_s etter_impl.h" 14 #include "content/shell/browser/layout_test/layout_test_bluetooth_fake_adapter_s etter_impl.h"
15 #include "content/shell/browser/layout_test/layout_test_browser_context.h" 15 #include "content/shell/browser/layout_test/layout_test_browser_context.h"
16 #include "content/shell/browser/layout_test/layout_test_browser_main_parts.h" 16 #include "content/shell/browser/layout_test/layout_test_browser_main_parts.h"
17 #include "content/shell/browser/layout_test/layout_test_message_filter.h" 17 #include "content/shell/browser/layout_test/layout_test_message_filter.h"
18 #include "content/shell/browser/layout_test/layout_test_notification_manager.h" 18 #include "content/shell/browser/layout_test/layout_test_notification_manager.h"
19 #include "content/shell/browser/layout_test/layout_test_resource_dispatcher_host _delegate.h" 19 #include "content/shell/browser/layout_test/layout_test_resource_dispatcher_host _delegate.h"
20 #include "content/shell/browser/shell_browser_context.h" 20 #include "content/shell/browser/shell_browser_context.h"
21 #include "content/shell/common/layout_test/layout_test_switches.h" 21 #include "content/shell/common/layout_test/layout_test_switches.h"
22 #include "content/shell/common/shell_messages.h" 22 #include "content/shell/common/shell_messages.h"
23 #include "content/shell/renderer/layout_test/blink_test_helpers.h" 23 #include "content/shell/renderer/layout_test/blink_test_helpers.h"
24 #include "services/shell/public/cpp/interface_registry.h" 24 #include "services/service_manager/public/cpp/interface_registry.h"
25 25
26 namespace content { 26 namespace content {
27 namespace { 27 namespace {
28 28
29 LayoutTestContentBrowserClient* g_layout_test_browser_client; 29 LayoutTestContentBrowserClient* g_layout_test_browser_client;
30 30
31 } // namespace 31 } // namespace
32 32
33 LayoutTestContentBrowserClient::LayoutTestContentBrowserClient() { 33 LayoutTestContentBrowserClient::LayoutTestContentBrowserClient() {
34 DCHECK(!g_layout_test_browser_client); 34 DCHECK(!g_layout_test_browser_client);
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 set_browser_main_parts(new LayoutTestBrowserMainParts(parameters)); 127 set_browser_main_parts(new LayoutTestBrowserMainParts(parameters));
128 return shell_browser_main_parts(); 128 return shell_browser_main_parts();
129 } 129 }
130 130
131 PlatformNotificationService* 131 PlatformNotificationService*
132 LayoutTestContentBrowserClient::GetPlatformNotificationService() { 132 LayoutTestContentBrowserClient::GetPlatformNotificationService() {
133 return layout_test_notification_manager_.get(); 133 return layout_test_notification_manager_.get();
134 } 134 }
135 135
136 } // namespace content 136 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/DEPS ('k') | content/shell/renderer/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698