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

Unified Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 2321313002: Move components/memory_coordinator -> content/ (Closed)
Patch Set: rebase etc Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_process_host_impl.cc
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 1bab21a40d81bba826dc21758607e111236a06a3..a12f3ae03bce924e19f1ffdfaef4cc1b091365af 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -47,8 +47,6 @@
#include "build/build_config.h"
#include "cc/base/switches.h"
#include "cc/output/buffer_to_texture_target_map.h"
-#include "components/memory_coordinator/browser/memory_coordinator.h"
-#include "components/memory_coordinator/common/memory_coordinator_features.h"
#include "components/tracing/common/tracing_switches.h"
#include "content/browser/appcache/appcache_dispatcher_host.h"
#include "content/browser/appcache/chrome_appcache_service.h"
@@ -84,6 +82,7 @@
#include "content/browser/media/capture/image_capture_impl.h"
#include "content/browser/media/media_internals.h"
#include "content/browser/media/midi_host.h"
+#include "content/browser/memory/memory_coordinator.h"
#include "content/browser/memory/memory_message_filter.h"
#include "content/browser/message_port_message_filter.h"
#include "content/browser/mime_registry_impl.h"
@@ -458,9 +457,9 @@ class SessionStorageHolder : public base::SupportsUserData::Data {
void CreateMemoryCoordinatorHandle(
int render_process_id,
- memory_coordinator::mojom::MemoryCoordinatorHandleRequest request) {
- memory_coordinator::MemoryCoordinator::GetInstance()->CreateHandle(
- render_process_id, std::move(request));
+ mojom::MemoryCoordinatorHandleRequest request) {
+ MemoryCoordinator::GetInstance()->CreateHandle(render_process_id,
+ std::move(request));
}
} // namespace
@@ -1232,7 +1231,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
base::Bind(&BroadcastChannelProvider::Connect,
base::Unretained(
storage_partition_impl_->GetBroadcastChannelProvider())));
- if (memory_coordinator::IsEnabled()) {
+ if (base::FeatureList::IsEnabled(features::kMemoryCoordinator)) {
AddUIThreadInterface(
registry.get(), base::Bind(&CreateMemoryCoordinatorHandle, GetID()));
}

Powered by Google App Engine
This is Rietveld 408576698