| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 // Represents the browser side of the browser <--> renderer communication | 5 // Represents the browser side of the browser <--> renderer communication |
| 6 // channel. There will be one RenderProcessHost per renderer process. | 6 // channel. There will be one RenderProcessHost per renderer process. |
| 7 | 7 |
| 8 #include "content/browser/renderer_host/render_process_host_impl.h" | 8 #include "content/browser/renderer_host/render_process_host_impl.h" |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 1449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1460 base::Unretained(this))); | 1460 base::Unretained(this))); |
| 1461 | 1461 |
| 1462 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 1462 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 1463 switches::kEnableNetworkService)) { | 1463 switches::kEnableNetworkService)) { |
| 1464 AddUIThreadInterface( | 1464 AddUIThreadInterface( |
| 1465 registry.get(), | 1465 registry.get(), |
| 1466 base::Bind(&RenderProcessHostImpl::CreateURLLoaderFactory, | 1466 base::Bind(&RenderProcessHostImpl::CreateURLLoaderFactory, |
| 1467 base::Unretained(this))); | 1467 base::Unretained(this))); |
| 1468 } | 1468 } |
| 1469 | 1469 |
| 1470 registry->AddInterface(base::Bind( |
| 1471 &ChromeBlobStorageContext::BindBlobRegistry, |
| 1472 base::Unretained(ChromeBlobStorageContext::GetFor(browser_context_)))); |
| 1473 |
| 1470 ServiceManagerConnection* service_manager_connection = | 1474 ServiceManagerConnection* service_manager_connection = |
| 1471 BrowserContext::GetServiceManagerConnectionFor(browser_context_); | 1475 BrowserContext::GetServiceManagerConnectionFor(browser_context_); |
| 1472 std::unique_ptr<ConnectionFilterImpl> connection_filter( | 1476 std::unique_ptr<ConnectionFilterImpl> connection_filter( |
| 1473 new ConnectionFilterImpl(child_connection_->child_identity(), | 1477 new ConnectionFilterImpl(child_connection_->child_identity(), |
| 1474 std::move(registry))); | 1478 std::move(registry))); |
| 1475 connection_filter_controller_ = connection_filter->controller(); | 1479 connection_filter_controller_ = connection_filter->controller(); |
| 1476 connection_filter_id_ = service_manager_connection->AddConnectionFilter( | 1480 connection_filter_id_ = service_manager_connection->AddConnectionFilter( |
| 1477 std::move(connection_filter)); | 1481 std::move(connection_filter)); |
| 1478 } | 1482 } |
| 1479 | 1483 |
| (...skipping 1868 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3348 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error; | 3352 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error; |
| 3349 | 3353 |
| 3350 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. | 3354 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. |
| 3351 // Capture the error message in a crash key value. | 3355 // Capture the error message in a crash key value. |
| 3352 base::debug::ScopedCrashKey error_key_value("mojo-message-error", error); | 3356 base::debug::ScopedCrashKey error_key_value("mojo-message-error", error); |
| 3353 bad_message::ReceivedBadMessage(render_process_id, | 3357 bad_message::ReceivedBadMessage(render_process_id, |
| 3354 bad_message::RPH_MOJO_PROCESS_ERROR); | 3358 bad_message::RPH_MOJO_PROCESS_ERROR); |
| 3355 } | 3359 } |
| 3356 | 3360 |
| 3357 } // namespace content | 3361 } // namespace content |
| OLD | NEW |