Revert 138216 - [Sync] Turn notifier::PushClient into an interface

chrome/service/cloud_print/cloud_print_proxy_backend.cc

Index: chrome/service/cloud_print/cloud_print_proxy_backend.cc
===================================================================
--- chrome/service/cloud_print/cloud_print_proxy_backend.cc	(revision 138220)
+++ chrome/service/cloud_print/cloud_print_proxy_backend.cc	(working copy)
@@ -26,7 +26,6 @@
 #include "grit/generated_resources.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "jingle/notifier/listener/push_client.h"
-#include "jingle/notifier/listener/push_client_observer.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // The real guts of CloudPrintProxyBackend, to keep the public client API clean.
@@ -34,7 +33,7 @@
     : public base::RefCountedThreadSafe<CloudPrintProxyBackend::Core>,
       public CloudPrintAuth::Client,
       public CloudPrintConnector::Client,
-      public notifier::PushClientObserver {
+      public notifier::PushClient::Observer {
  public:
   // It is OK for print_server_url to be empty. In this case system should
   // use system default (local) print server.
@@ -87,7 +86,7 @@
   // CloudPrintConnector::Client implementation.
   virtual void OnAuthFailed() OVERRIDE;
 
-  // notifier::PushClientObserver implementation.
+  // notifier::PushClient::Delegate implementation.
   virtual void OnNotificationStateChange(
       bool notifications_enabled) OVERRIDE;
   virtual void OnIncomingNotification(
@@ -391,7 +390,7 @@
   notifier_options.request_context_getter =
       g_service_process->GetServiceURLRequestContextGetter();
   notifier_options.auth_mechanism = "X-OAUTH2";
-  push_client_ = notifier::PushClient::CreateDefault(notifier_options);
+  push_client_.reset(new notifier::PushClient(notifier_options));
   push_client_->AddObserver(this);
   notifier::Subscription subscription;
   subscription.channel = kCloudPrintPushNotificationsSource;