Revert everything related to the relanding.

chrome/service/cloud_print/job_status_updater.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_SERVICE_CLOUD_PRINT_JOB_STATUS_UPDATER_H_
 #define CHROME_SERVICE_CLOUD_PRINT_JOB_STATUS_UPDATER_H_
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/ref_counted.h"
-#include "base/scoped_ptr.h"
 #include "base/thread.h"
 #include "chrome/service/cloud_print/print_system.h"
 #include "chrome/common/net/url_fetcher.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request_status.h"
 
 // Periodically monitors the status of a local print job and updates the
 // cloud print server accordingly. When the job has been completed this
 // object releases the reference to itself which should cause it to
 // self-destruct.
@@ skipping 38 matching lines @@
 };
 
 // This typedef is to workaround the issue with certain versions of
 // Visual Studio where it gets confused between multiple Delegate
 // classes and gives a C2500 error. (I saw this error on the try bots -
 // the workaround was not needed for my machine).
 typedef JobStatusUpdater::Delegate JobStatusUpdaterDelegate;
 
 #endif  // CHROME_SERVICE_CLOUD_PRINT_JOB_STATUS_UPDATER_H_