Skip to content

Commit

Permalink
Delete all code for 'navigable contents' which is now unused
Browse files Browse the repository at this point in the history
Bug: 1136145, 1056219
Change-Id: I3fe051a8bdb30224a8d20b0f404d4c03f2eac80d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2467940
Auto-Submit: Manu Cornet <[email protected]>
Reviewed-by: John Abd-El-Malek <[email protected]>
Reviewed-by: Sam McNally <[email protected]>
Reviewed-by: Ken Rockot <[email protected]>
Reviewed-by: Xiyuan Xia <[email protected]>
Commit-Queue: Sam McNally <[email protected]>
Cr-Commit-Position: refs/heads/master@{#819256}
  • Loading branch information
Manu Cornet authored and Commit Bot committed Oct 21, 2020
1 parent 2251b8d commit 4f33eb2
Show file tree
Hide file tree
Showing 41 changed files with 2 additions and 2,485 deletions.
6 changes: 1 addition & 5 deletions content/browser/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,6 @@ source_set("browser") {
"//services/audio/public/cpp",
"//services/audio/public/mojom",
"//services/cert_verifier:lib",
"//services/content:impl",
"//services/content/public/cpp",
"//services/content/public/mojom",
"//services/data_decoder/public/cpp",
"//services/data_decoder/public/mojom",
"//services/device:lib",
Expand Down Expand Up @@ -220,6 +217,7 @@ source_set("browser") {
"//third_party/re2",
"//third_party/sqlite",
"//third_party/webrtc_overrides:webrtc_component",
"//third_party/wtl",
"//third_party/zlib",
"//third_party/zlib/google:zip",
"//ui/accessibility",
Expand Down Expand Up @@ -626,8 +624,6 @@ source_set("browser") {
"content_index/content_index_metrics.h",
"content_index/content_index_service_impl.cc",
"content_index/content_index_service_impl.h",
"content_service_delegate_impl.cc",
"content_service_delegate_impl.h",
"conversions/conversion_host.cc",
"conversions/conversion_host.h",
"conversions/conversion_internals_handler_impl.cc",
Expand Down
2 changes: 0 additions & 2 deletions content/browser/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ include_rules = [
# dependency.
"+services",
"-services/content",
"+services/content/public",
"+services/content/navigable_contents_delegate.h",
"+services/content/service.h",
"+services/content/service_delegate.h",
"-services/network",
Expand Down
25 changes: 1 addition & 24 deletions content/browser/browser_context.cc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
#include "content/browser/blob_storage/chrome_blob_storage_context.h"
#include "content/browser/browsing_data/browsing_data_remover_impl.h"
#include "content/browser/child_process_security_policy_impl.h"
#include "content/browser/content_service_delegate_impl.h"
#include "content/browser/download/download_manager_impl.h"
#include "content/browser/media/browser_feature_provider.h"
#include "content/browser/permissions/permission_controller_impl.h"
Expand All @@ -60,7 +59,6 @@
#include "media/learning/common/media_learning_tasks.h"
#include "media/learning/impl/learning_session_impl.h"
#include "media/mojo/services/video_decode_perf_history.h"
#include "services/content/service.h"
#include "storage/browser/blob/blob_storage_context.h"
#include "storage/browser/database/database_tracker.h"
#include "storage/browser/file_system/external_mount_points.h"
Expand All @@ -73,19 +71,11 @@ namespace {

class ContentServiceHolder : public base::SupportsUserData::Data {
public:
explicit ContentServiceHolder(BrowserContext* browser_context)
: delegate_(browser_context) {
delegate_.AddService(&service_);
}
explicit ContentServiceHolder(BrowserContext* browser_context) {}

~ContentServiceHolder() override = default;

content::Service& service() { return service_; }

private:
ContentServiceDelegateImpl delegate_;
content::Service service_{&delegate_};

DISALLOW_COPY_AND_ASSIGN(ContentServiceHolder);
};

Expand Down Expand Up @@ -544,19 +534,6 @@ const std::string& BrowserContext::UniqueId() {
return unique_id_;
}

void BrowserContext::BindNavigableContentsFactory(
mojo::PendingReceiver<content::mojom::NavigableContentsFactory> receiver) {
auto* service_holder =
static_cast<ContentServiceHolder*>(GetUserData(kContentServiceKey));
if (!service_holder) {
auto new_holder = std::make_unique<ContentServiceHolder>(this);
service_holder = new_holder.get();
SetUserData(kContentServiceKey, std::move(new_holder));
}

service_holder->service().BindNavigableContentsFactory(std::move(receiver));
}

media::VideoDecodePerfHistory* BrowserContext::GetVideoDecodePerfHistory() {
media::VideoDecodePerfHistory* decode_history =
static_cast<media::VideoDecodePerfHistory*>(
Expand Down
5 changes: 0 additions & 5 deletions content/browser/browser_main_loop.cc
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@
#include "net/ssl/ssl_config_service.h"
#include "ppapi/buildflags/buildflags.h"
#include "services/audio/service.h"
#include "services/content/public/cpp/navigable_contents_view.h"
#include "services/data_decoder/public/cpp/service_provider.h"
#include "services/network/transitional_url_loader_factory_owner.h"
#include "skia/ext/event_tracer_impl.h"
Expand Down Expand Up @@ -1471,10 +1470,6 @@ void BrowserMainLoop::InitializeMojo() {
mojo::SyncCallRestrictions::DisallowSyncCall();
}

// Ensure that any NavigableContentsViews constructed in the browser process
// know they're running in the same process as the service.
content::NavigableContentsView::SetClientRunningInServiceProcess();

// Start startup tracing through TracingController's interface. TraceLog has
// been enabled in content_main_runner where threads are not available. Now We
// need to start tracing for all other tracing agents, which require threads.
Expand Down
223 changes: 0 additions & 223 deletions content/browser/content_service_browsertest.cc

This file was deleted.

Loading

0 comments on commit 4f33eb2

Please sign in to comment.