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

Unified Diff: chrome/service/cloud_print/printer_job_handler_unittest.cc

Issue 15836003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 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: chrome/service/cloud_print/printer_job_handler_unittest.cc
diff --git a/chrome/service/cloud_print/printer_job_handler_unittest.cc b/chrome/service/cloud_print/printer_job_handler_unittest.cc
index 253581008b1bd71a2d7d41573150fd4e0737397e..3f21f8870fe020c9c78f097769d9f89aa8e8d04e 100644
--- a/chrome/service/cloud_print/printer_job_handler_unittest.cc
+++ b/chrome/service/cloud_print/printer_job_handler_unittest.cc
@@ -385,16 +385,12 @@ class MockPrintSystem : public PrintSystem {
return PrintSystem::PrintSystemResult(false, "failure");
}
- MockJobSpooler& JobSpooler() {
- return *job_spooler_;
- }
+ MockJobSpooler& JobSpooler() { return *job_spooler_.get(); }
- MockPrinterWatcher& PrinterWatcher() {
- return *printer_watcher_;
- }
+ MockPrinterWatcher& PrinterWatcher() { return *printer_watcher_.get(); }
MockPrintServerWatcher& PrintServerWatcher() {
- return *print_server_watcher_;
+ return *print_server_watcher_.get();
}
MOCK_METHOD0(Init, PrintSystem::PrintSystemResult());
@@ -491,7 +487,7 @@ void PrinterJobHandlerTest::SetUp() {
ON_CALL(print_system_->PrinterWatcher(), GetCurrentPrinterInfo(_))
.WillByDefault(Invoke(this, &PrinterJobHandlerTest::GetPrinterInfo));
- ON_CALL(*print_system_, GetPrinterCapsAndDefaults(_, _))
+ ON_CALL(*print_system_.get(), GetPrinterCapsAndDefaults(_, _))
.WillByDefault(Invoke(this, &PrinterJobHandlerTest::SendCapsAndDefaults));
CloudPrintURLFetcher::set_factory(&cloud_print_factory_);
@@ -580,9 +576,11 @@ void PrinterJobHandlerTest::SetUpJobSuccessTest(int job_num) {
}
void PrinterJobHandlerTest::BeginTest(int timeout_seconds) {
- job_handler_ = new PrinterJobHandler(basic_info_, info_from_cloud_,
+ job_handler_ = new PrinterJobHandler(basic_info_,
+ info_from_cloud_,
GURL(kExampleCloudPrintServerURL),
- print_system_, &jobhandler_delegate_);
+ print_system_.get(),
+ &jobhandler_delegate_);
job_handler_->Initialize();
« no previous file with comments | « chrome/service/cloud_print/printer_job_handler.cc ('k') | chrome/service/gaia/service_gaia_authenticator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698