indexeddb: Remove IndexedDBContextImpl users in tests

This patch restricts IndexedDBContextImpl usages to StoragePartitionImpl
and indexeddb itself.  This is one of the final pieces before
the StoragePartitionImpl bit can be removed and IndexedDBControl is used
by StoragePartitionImpl instead of IndexedDBContext.

Bug: 1015214
Change-Id: Ia96becbba462716e001633cc526afa55dd6af7cf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2092182
Commit-Queue: enne <enne@chromium.org>
Reviewed-by: Daniel Murphy <dmurph@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748915}

content/browser/indexed_db/indexed_db_browsertest.cc

@@ -149,15 +149,6 @@ class IndexedDBBrowserTest : public ContentBrowserTest,
     EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
   }
 
-  // TODO(enne): remove this in favor of GetControl below.
-  IndexedDBContextImpl* GetContext(Shell* browser = nullptr) {
-    if (!browser)
-      browser = shell();
-    StoragePartition* partition = BrowserContext::GetDefaultStoragePartition(
-        browser->web_contents()->GetBrowserContext());
-    return partition->GetIndexedDBContextImplForTesting();
-  }
-
   storage::mojom::IndexedDBControl& GetControl(Shell* browser = nullptr) {
     if (!browser)
       browser = shell();

content/browser/indexed_db/indexed_db_internals_ui.cc

@@ -15,7 +15,6 @@
 #include "base/task/thread_pool.h"
 #include "base/threading/platform_thread.h"
 #include "base/values.h"
-#include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/grit/dev_ui_content_resources.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_task_traits.h"

content/browser/storage_partition_impl.cc

@@ -1695,11 +1695,6 @@ storage::mojom::IndexedDBControl& StoragePartitionImpl::GetIndexedDBControl() {
   return *indexed_db_control_;
 }
 
-IndexedDBContextImpl*
-StoragePartitionImpl::GetIndexedDBContextImplForTesting() {
-  return GetIndexedDBContextInternal();
-}
-
 IndexedDBContextImpl* StoragePartitionImpl::GetIndexedDBContextInternal() {
   DCHECK(initialized_);
   return indexed_db_context_.get();

content/browser/storage_partition_impl.h

@@ -138,7 +138,6 @@ class CONTENT_EXPORT StoragePartitionImpl
   IdleManager* GetIdleManager();
   LockManager* GetLockManager();  // override; TODO: Add to interface
   storage::mojom::IndexedDBControl& GetIndexedDBControl() override;
-  IndexedDBContextImpl* GetIndexedDBContextImplForTesting() override;
   NativeFileSystemEntryFactory* GetNativeFileSystemEntryFactory() override;
   CacheStorageContextImpl* GetCacheStorageContext() override;
   ServiceWorkerContextWrapper* GetServiceWorkerContext() override;

content/public/browser/storage_partition.h

@@ -61,7 +61,6 @@ class DedicatedWorkerService;
 class DevToolsBackgroundServicesContext;
 class DOMStorageContext;
 class GeneratedCodeCacheContext;
-class IndexedDBContextImpl;
 class NativeFileSystemEntryFactory;
 class PlatformNotificationContext;
 class ServiceWorkerContext;
@@ -128,7 +127,6 @@ class CONTENT_EXPORT StoragePartition {
   virtual storage::DatabaseTracker* GetDatabaseTracker() = 0;
   virtual DOMStorageContext* GetDOMStorageContext() = 0;
   virtual storage::mojom::IndexedDBControl& GetIndexedDBControl() = 0;
-  virtual IndexedDBContextImpl* GetIndexedDBContextImplForTesting() = 0;
   virtual NativeFileSystemEntryFactory* GetNativeFileSystemEntryFactory() = 0;
   virtual ServiceWorkerContext* GetServiceWorkerContext() = 0;
   virtual DedicatedWorkerService* GetDedicatedWorkerService() = 0;

content/public/test/test_storage_partition.cc

@@ -85,11 +85,6 @@ storage::mojom::IndexedDBControl& TestStoragePartition::GetIndexedDBControl() {
   return *indexed_db_control_;
 }
 
-IndexedDBContextImpl*
-TestStoragePartition::GetIndexedDBContextImplForTesting() {
-  return indexed_db_context_;
-}
-
 NativeFileSystemEntryFactory*
 TestStoragePartition::GetNativeFileSystemEntryFactory() {
   return nullptr;

content/public/test/test_storage_partition.h

@@ -22,7 +22,6 @@ class AppCacheService;
 class BackgroundSyncContext;
 class DevToolsBackgroundServicesContext;
 class DOMStorageContext;
-class IndexedDBContextImpl;
 class NativeFileSystemEntryFactory;
 class PlatformNotificationContext;
 class ServiceWorkerContext;
@@ -108,10 +107,6 @@ class TestStoragePartition : public StoragePartition {
 
   storage::mojom::IndexedDBControl& GetIndexedDBControl() override;
 
-  void set_indexed_db_context(IndexedDBContextImpl* context) {
-    indexed_db_context_ = context;
-  }
-  IndexedDBContextImpl* GetIndexedDBContextImplForTesting() override;
   NativeFileSystemEntryFactory* GetNativeFileSystemEntryFactory() override;
 
   void set_service_worker_context(ServiceWorkerContext* context) {
@@ -219,7 +214,6 @@ class TestStoragePartition : public StoragePartition {
   storage::DatabaseTracker* database_tracker_ = nullptr;
   DOMStorageContext* dom_storage_context_ = nullptr;
   mojo::Remote<storage::mojom::IndexedDBControl> indexed_db_control_;
-  IndexedDBContextImpl* indexed_db_context_ = nullptr;
   ServiceWorkerContext* service_worker_context_ = nullptr;
   DedicatedWorkerService* dedicated_worker_service_ = nullptr;
   SharedWorkerService* shared_worker_service_ = nullptr;