Refactoring: Get rid of HTMLImportLoaerClient

Source/core/html/imports/HTMLImportChild.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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef HTMLImportChild_h
 #define HTMLImportChild_h
 
 #include "core/fetch/RawResource.h"
 #include "core/fetch/ResourceOwner.h"
 #include "core/html/imports/HTMLImport.h"
-#include "core/html/imports/HTMLImportLoaderClient.h"
 #include "platform/weborigin/KURL.h"
 #include "wtf/Vector.h"
 
 namespace WebCore {
 
 class CustomElementMicrotaskImportStep;
 class HTMLImportLoader;
 class HTMLImportChildClient;
 class HTMLLinkElement;
 
 //
 // An import tree node subclas to encapsulate imported document
 // lifecycle. This class is owned by LinkStyle. The actual loading
 // is done by HTMLImportLoader, which can be shared among multiple
 // HTMLImportChild of same link URL.
 //
 // HTMLImportChild implements ResourceClient through ResourceOwner
 // so that it can speculatively request linked resources while it is unblocked.
 //
-class HTMLImportChild FINAL : public HTMLImport, public HTMLImportLoaderClient, public ResourceOwner<RawResource> {
+class HTMLImportChild FINAL : public HTMLImport, public ResourceOwner<RawResource> {
 public:
     HTMLImportChild(Document&, const KURL&, bool sync);
     virtual ~HTMLImportChild();
 
     HTMLLinkElement* link() const;
     Document* importedDocument() const;
     const KURL& url() const { return m_url; }
 
     void wasAlreadyLoaded();
     void startLoading(const ResourcePtr<RawResource>&);
@@ skipping 13 matching lines @@
     virtual void stateDidChange() OVERRIDE;
 
 #if !defined(NDEBUG)
     virtual void showThis() OVERRIDE;
 #endif
 
     void setClient(HTMLImportChildClient*);
     void clearClient();
     bool loaderHasError() const;
 
+    void didFinishLoading();
+
 private:
     // RawResourceOwner doing nothing.
     // HTMLImportChild owns the resource so that the contents of prefetched Resource doesn't go away.
     virtual void responseReceived(Resource*, const ResourceResponse&) OVERRIDE { }
     virtual void dataReceived(Resource*, const char*, int) OVERRIDE { }
     virtual void notifyFinished(Resource*) OVERRIDE { }
 
-    // HTMLImportLoaderClient
-    virtual void didFinishLoading() OVERRIDE;
-
     void didFinish();
     void createLoader();
     void shareLoader(HTMLImportChild*);
     void ensureLoader();
 
     Document& m_master;
     KURL m_url;
     CustomElementMicrotaskImportStep* m_customElementMicrotaskStep;
     RefPtr<HTMLImportLoader> m_loader;
     HTMLImportChildClient* m_client;
 };
 
 inline HTMLImportChild* toHTMLImportChild(HTMLImport* import)
 {
     ASSERT(!import || import->isChild());
     return static_cast<HTMLImportChild*>(import);
 }
 
 } // namespace WebCore
 
 #endif // HTMLImportChild_h