Almost done: ApplicationDelegate -> ApplicationImplBase conversion.

services/util/cpp/factory_service_base.h

 // Copyright 2016 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 MOJO_SERVICES_UTIL_CPP_FACTORY_SERVICE_BASE_H_
 #define MOJO_SERVICES_UTIL_CPP_FACTORY_SERVICE_BASE_H_
 
 #include <memory>
 #include <unordered_set>
 
 #include "base/logging.h"
-#include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/application/application_impl_base.h"
 
 namespace mojo {
 namespace util {
 
-class FactoryServiceBase : public ApplicationDelegate {
+class FactoryServiceBase : public ApplicationImplBase {
  public:
   // Provides common behavior for all objects created by the factory service.
   class ProductBase : public std::enable_shared_from_this<ProductBase> {
    public:
     virtual ~ProductBase();
 
    protected:
-    ProductBase(FactoryServiceBase* owner);
+    explicit ProductBase(FactoryServiceBase* owner);
 
-    // Returns the ApplicationImpl.
-    ApplicationImpl* app() {
-      DCHECK(owner_->app());
-      return owner_->app();
-    }
+    // Returns the owner.
+    FactoryServiceBase* owner() { return owner_; }
 
     // Tells the factory service to release this product.
     void ReleaseFromOwner() {
       size_t erased = owner_->products_.erase(shared_from_this());
       DCHECK(erased);
     }
 
    private:
     FactoryServiceBase* owner_;
   };
@@ skipping 22 matching lines @@
     }
 
    private:
     Binding<Interface> binding_;
   };
 
   FactoryServiceBase();
 
   ~FactoryServiceBase() override;
 
-  ApplicationImpl* app() { return app_; }
-
-  // ApplicationDelegate implementation.
-  void Initialize(ApplicationImpl* app) override;
-
  protected:
   template <typename ProductImpl>
   void AddProduct(std::shared_ptr<ProductImpl> product) {
     products_.insert(std::static_pointer_cast<ProductBase>(product));
   }
 
  private:
-  ApplicationImpl* app_;
   std::unordered_set<std::shared_ptr<ProductBase>> products_;
 };
 
 // For use by products when handling mojo requests.
 // Checks the condition, and, if it's false, unbinds, releases from the owner
 // and calls return. Doesn't support stream arguments.
 // TODO(dalesat): Support stream arguments.
 #define RCHECK(condition)                                         \
   if (!(condition)) {                                             \
     LOG(ERROR) << "request precondition failed: " #condition "."; \
     UnbindAndReleaseFromOwner();                                  \
     return;                                                       \
   }
 
 }  // namespace util
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_UTIL_CPP_FACTORY_SERVICE_BASE_H_