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

Unified Diff: chrome/browser/ui/webui/print_preview/printer_capabilities_unittest.cc

Issue 2959823003: Remove GetBlockingPool() usage in PrinterCapabilitiesTest. (Closed)
Patch Set: Created 3 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/print_preview/printer_capabilities_unittest.cc
diff --git a/chrome/browser/ui/webui/print_preview/printer_capabilities_unittest.cc b/chrome/browser/ui/webui/print_preview/printer_capabilities_unittest.cc
index be7765328881bb596598836278b7fdecd3b0fbff..f06e3f26e6fd40b882d21f174218caf9a6479a1f 100644
--- a/chrome/browser/ui/webui/print_preview/printer_capabilities_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview/printer_capabilities_unittest.cc
@@ -7,81 +7,51 @@
#include "base/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
-#include "base/run_loop.h"
-#include "base/task_runner_util.h"
#include "base/test/values_test_util.h"
-#include "base/threading/sequenced_worker_pool.h"
#include "chrome/browser/ui/webui/print_preview/printer_capabilities.h"
-#include "content/public/browser/browser_thread.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "printing/backend/test_print_backend.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/geometry/size.h"
-namespace {
-
-void SettingsReply(std::unique_ptr<base::DictionaryValue>* out,
- std::unique_ptr<base::DictionaryValue> reply) {
- *out = std::move(reply);
-}
-
-std::unique_ptr<base::DictionaryValue> GetSettingsSynchronous(
- const std::string& printer_name,
- const printing::PrinterBasicInfo& basic_info) {
- std::unique_ptr<base::DictionaryValue> settings_dictionary;
-
- base::SequencedWorkerPool* worker_pool =
- content::BrowserThread::GetBlockingPool();
-
- base::PostTaskAndReplyWithResult(
- worker_pool, FROM_HERE, base::Bind(&printing::GetSettingsOnBlockingPool,
- printer_name, basic_info),
- base::Bind(&SettingsReply, base::Unretained(&settings_dictionary)));
-
- worker_pool->FlushForTesting();
- base::RunLoop().RunUntilIdle();
-
- return settings_dictionary;
-}
-
-} // namespace
+namespace printing {
class PrinterCapabilitiesTest : public testing::Test {
public:
- PrinterCapabilitiesTest() : test_browser_threads_() {}
+ PrinterCapabilitiesTest() {}
+ ~PrinterCapabilitiesTest() override {}
protected:
void SetUp() override {
- test_backend_ = new printing::TestPrintBackend();
- printing::PrintBackend::SetPrintBackendForTesting(test_backend_.get());
+ test_backend_ = new TestPrintBackend();
+ PrintBackend::SetPrintBackendForTesting(test_backend_.get());
}
void TearDown() override { test_backend_ = nullptr; }
- printing::TestPrintBackend* print_backend() { return test_backend_.get(); }
+ TestPrintBackend* print_backend() { return test_backend_.get(); }
private:
content::TestBrowserThreadBundle test_browser_threads_;
- scoped_refptr<printing::TestPrintBackend> test_backend_;
+ scoped_refptr<TestPrintBackend> test_backend_;
};
// Verify that we don't crash for a missing printer and a nullptr is never
// returned.
TEST_F(PrinterCapabilitiesTest, NonNullForMissingPrinter) {
- printing::PrinterBasicInfo basic_info;
+ PrinterBasicInfo basic_info;
std::string printer_name = "missing_printer";
std::unique_ptr<base::DictionaryValue> settings_dictionary =
- GetSettingsSynchronous(printer_name, basic_info);
+ GetSettingsOnBlockingPool(printer_name, basic_info);
ASSERT_TRUE(settings_dictionary);
}
TEST_F(PrinterCapabilitiesTest, ProvidedCapabilitiesUsed) {
std::string printer_name = "test_printer";
- printing::PrinterBasicInfo basic_info;
- std::unique_ptr<printing::PrinterSemanticCapsAndDefaults> caps =
- base::MakeUnique<printing::PrinterSemanticCapsAndDefaults>();
+ PrinterBasicInfo basic_info;
+ auto caps = base::MakeUnique<PrinterSemanticCapsAndDefaults>();
// set a capability
caps->dpis = {gfx::Size(600, 600)};
@@ -89,7 +59,7 @@ TEST_F(PrinterCapabilitiesTest, ProvidedCapabilitiesUsed) {
print_backend()->AddValidPrinter(printer_name, std::move(caps));
std::unique_ptr<base::DictionaryValue> settings_dictionary =
- GetSettingsSynchronous(printer_name, basic_info);
+ GetSettingsOnBlockingPool(printer_name, basic_info);
// verify settings were created
ASSERT_TRUE(settings_dictionary);
@@ -108,13 +78,13 @@ TEST_F(PrinterCapabilitiesTest, ProvidedCapabilitiesUsed) {
// doesn't return capabilities.
TEST_F(PrinterCapabilitiesTest, NullCapabilitiesExcluded) {
std::string printer_name = "test_printer";
- printing::PrinterBasicInfo basic_info;
+ PrinterBasicInfo basic_info;
// return false when attempting to retrieve capabilities
print_backend()->AddValidPrinter(printer_name, nullptr);
std::unique_ptr<base::DictionaryValue> settings_dictionary =
- GetSettingsSynchronous(printer_name, basic_info);
+ GetSettingsOnBlockingPool(printer_name, basic_info);
// verify settings were created
ASSERT_TRUE(settings_dictionary);
@@ -124,3 +94,5 @@ TEST_F(PrinterCapabilitiesTest, NullCapabilitiesExcluded) {
ASSERT_TRUE(settings_dictionary->GetDictionary("capabilities", &caps_dict));
EXPECT_TRUE(caps_dict->empty());
}
+
+} // namespace printing
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698