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

Unified Diff: content/browser/payments/payment_app_content_unittest_base.cc

Issue 2609103002: PaymentApp: Add PaymentAppProvider class. (Closed)
Patch Set: Remove override keyword Created 3 years, 11 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/payments/payment_app_content_unittest_base.cc
diff --git a/content/browser/payments/payment_app_content_unittest_base.cc b/content/browser/payments/payment_app_content_unittest_base.cc
index 939ac9b483b389809d23b8c9b87c16a68b2ab25d..38ffa37a5d8351e742736eb6ec8778d809d583bb 100644
--- a/content/browser/payments/payment_app_content_unittest_base.cc
+++ b/content/browser/payments/payment_app_content_unittest_base.cc
@@ -44,22 +44,18 @@ void UnregisterServiceWorkerCallback(bool* called,
PaymentAppContentUnitTestBase::PaymentAppContentUnitTestBase()
: thread_bundle_(
new TestBrowserThreadBundle(TestBrowserThreadBundle::IO_MAINLOOP)),
- embedded_worker_helper_(new EmbeddedWorkerTestHelper(base::FilePath())),
- storage_partition_impl_(
- new StoragePartitionImpl(
- embedded_worker_helper_->browser_context(), base::FilePath(),
- nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
- nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr)),
- payment_app_context_(new PaymentAppContextImpl()) {
+ embedded_worker_helper_(new EmbeddedWorkerTestHelper(base::FilePath())) {
embedded_worker_helper_->context_wrapper()->set_storage_partition(
- storage_partition_impl_.get());
- payment_app_context_->Init(embedded_worker_helper_->context_wrapper());
+ storage_partition());
+ payment_app_context()->Init(embedded_worker_helper_->context_wrapper());
base::RunLoop().RunUntilIdle();
}
-PaymentAppContentUnitTestBase::~PaymentAppContentUnitTestBase() {
- payment_app_context_->Shutdown();
- base::RunLoop().RunUntilIdle();
+PaymentAppContentUnitTestBase::~PaymentAppContentUnitTestBase() {}
+
+BrowserContext* PaymentAppContentUnitTestBase::browser_context() {
+ DCHECK(embedded_worker_helper_);
+ return embedded_worker_helper_->browser_context();
}
PaymentAppManager* PaymentAppContentUnitTestBase::CreatePaymentAppManager(
@@ -75,12 +71,12 @@ PaymentAppManager* PaymentAppContentUnitTestBase::CreatePaymentAppManager(
// This function should eventually return created payment app manager
// but there is no way to get last created payment app manager from
- // payment_app_context_->payment_app_managers_ because its type is std::map
+ // payment_app_context()->payment_app_managers_ because its type is std::map
// and can not ensure its order. So, just make a set of existing payment app
// managers before creating a new manager and then check what is a new thing.
std::set<PaymentAppManager*> existing_managers;
for (const auto& existing_manager :
- payment_app_context_->payment_app_managers_) {
+ payment_app_context()->payment_app_managers_) {
existing_managers.insert(existing_manager.first);
}
@@ -89,12 +85,12 @@ PaymentAppManager* PaymentAppContentUnitTestBase::CreatePaymentAppManager(
mojo::InterfaceRequest<payments::mojom::PaymentAppManager> request =
mojo::MakeRequest(&manager);
payment_app_managers_.push_back(std::move(manager));
- payment_app_context_->CreatePaymentAppManager(std::move(request));
+ payment_app_context()->CreatePaymentAppManager(std::move(request));
base::RunLoop().RunUntilIdle();
// Find a last registered payment app manager.
for (const auto& candidate_manager :
- payment_app_context_->payment_app_managers_) {
+ payment_app_context()->payment_app_managers_) {
if (!base::ContainsKey(existing_managers, candidate_manager.first)) {
candidate_manager.first->Init(scope_url.spec());
base::RunLoop().RunUntilIdle();
@@ -152,4 +148,13 @@ void PaymentAppContentUnitTestBase::UnregisterServiceWorker(
EXPECT_TRUE(called);
}
+StoragePartitionImpl* PaymentAppContentUnitTestBase::storage_partition() {
+ return static_cast<StoragePartitionImpl*>(
+ BrowserContext::GetDefaultStoragePartition(browser_context()));
+}
+
+PaymentAppContextImpl* PaymentAppContentUnitTestBase::payment_app_context() {
+ return storage_partition()->GetPaymentAppContext();
+}
+
} // namespace content
« no previous file with comments | « content/browser/payments/payment_app_content_unittest_base.h ('k') | content/browser/payments/payment_app_context_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698