ServiceWorker: Enable ServiceWorkerRegistration and update layout tests

public/platform/WebServiceWorkerProvider.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 33 matching lines @@
 
 // Created on the main thread, and may be passed to another script context
 // thread (e.g. worker thread) later. All methods of this class must be called
 // on the single script context thread.
 class WebServiceWorkerProvider {
 public:
     // Called when a client wants to start listening to the service worker
     // events. Must be cleared before the client becomes invalid.
     virtual void setClient(WebServiceWorkerProviderClient*) { }
 
-    // FIXME: Remove this macro after two-side patches are landed
-    // (http://crbug.com/396400).
-#define DISABLE_SERVICE_WORKER_REGISTRATION
-#ifdef DISABLE_SERVICE_WORKER_REGISTRATION
-    // The WebServiceWorker and WebServiceWorkerError ownership are passed to
-    // the WebServiceWorkerCallbacks implementation.
-    typedef WebCallbacks<WebServiceWorker, WebServiceWorkerError> WebServiceWorkerRegistrationCallbacks;
-#else
     // The WebServiceWorkerRegistration and WebServiceWorkerError ownership are
     // passed to the WebServiceWorkerRegistrationCallbacks implementation.
     typedef WebCallbacks<WebServiceWorkerRegistration, WebServiceWorkerError> WebServiceWorkerRegistrationCallbacks;
-#endif
 
     virtual void registerServiceWorker(const WebURL& pattern, const WebURL& scriptUrl, WebServiceWorkerRegistrationCallbacks*) { }
 
     // Unregisters the ServiceWorker for a given scope. The provider
     // must always pass null to onSuccess.
     // FIXME: "unregister" does not provide a WebServiceWorkerRegistration,
     // revisit this to clean up the the callback type to not take a
     // WebServiceWorkerRegistration*.
     virtual void unregisterServiceWorker(const WebURL& pattern, WebServiceWorkerRegistrationCallbacks*) { }
 
     virtual ~WebServiceWorkerProvider() { }
 };
 
 } // namespace blink
 
 #endif