| 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();
|
|
|
|
|