Make SimpleFactoryKey no longer an abstract class.
In this CL, we make SimpleFactoryKey::IsOffTheRecord() not be a virtual function
anymore. It allows a BrowserContext to create a SimpleFactoryKey without
creating a new subclass of SimpleFactoryKey. Beside, remove TestSimpleFactoryKey
which is no longer needed.
Bug: 933784
Change-Id: I26f0d9fc9676aabc92116aafa2124a823cb6afe1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1618202
Reviewed-by: Peter Beverloo <[email protected]>
Reviewed-by: Henrique Nakashima <[email protected]>
Reviewed-by: Colin Blundell <[email protected]>
Commit-Queue: Xi Han <[email protected]>
Cr-Commit-Position: refs/heads/master@{#661797}
diff --git a/content/shell/browser/shell_browser_context.cc b/content/shell/browser/shell_browser_context.cc
index 544b49c..3a964c1 100644
--- a/content/shell/browser/shell_browser_context.cc
+++ b/content/shell/browser/shell_browser_context.cc
@@ -17,8 +17,8 @@
#include "build/build_config.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/keyed_service/core/simple_dependency_manager.h"
+#include "components/keyed_service/core/simple_factory_key.h"
#include "components/keyed_service/core/simple_key_map.h"
-#include "components/keyed_service/core/test_simple_factory_key.h"
#include "components/network_session_configurator/common/network_switches.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
@@ -143,7 +143,7 @@
void ShellBrowserContext::FinishInitWhileIOAllowed() {
BrowserContext::Initialize(this, path_);
- key_ = std::make_unique<TestSimpleFactoryKey>(path_, off_the_record_);
+ key_ = std::make_unique<SimpleFactoryKey>(path_, off_the_record_);
SimpleKeyMap::GetInstance()->Associate(this, key_.get());
}
