Factor DartLibraryProvider out of DartLoader

sky/engine/core/script/dart_loader.h

Index: sky/engine/core/script/dart_loader.h
diff --git a/sky/engine/core/script/dart_loader.h b/sky/engine/core/script/dart_loader.h
deleted file mode 100644
index 660340934f1f77945ab2eb5ff92fab4a68e4e566..0000000000000000000000000000000000000000
--- a/sky/engine/core/script/dart_loader.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015 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 SKY_ENGINE_CORE_SCRIPT_DART_LOADER_H_
-#define SKY_ENGINE_CORE_SCRIPT_DART_LOADER_H_
-
-#include "base/callback_forward.h"
-#include "base/macros.h"
-#include "base/memory/weak_ptr.h"
-#include "dart/runtime/include/dart_api.h"
-#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
-#include "sky/engine/wtf/HashMap.h"
-#include "sky/engine/wtf/HashSet.h"
-#include "sky/engine/wtf/OwnPtr.h"
-#include "sky/engine/wtf/Vector.h"
-#include "sky/engine/wtf/text/WTFString.h"
-
-namespace blink {
-class DartState;
-class DartDependency;
-class DartDependencyCatcher;
-class KURL;
-
-// TODO(abarth): This class seems more complicated than it needs to be. Is
-// there some way of simplifying this system? For example, we have a bunch
-// of inner classes that could potentially be factored out in some other way.
-class DartLoader {
- public:
-  explicit DartLoader(DartState* dart_state);
-  ~DartLoader();
-
-  // TODO(dart): This can be called both on the main thread from application isolates
-  // or from the handle watcher isolate thread.
-  static Dart_Handle HandleLibraryTag(Dart_LibraryTag tag,
-                                      Dart_Handle library,
-                                      Dart_Handle url);
-
-  void LoadLibrary(const KURL& url, mojo::URLResponsePtr response = nullptr);
-
-  void WaitForDependencies(const HashSet<DartDependency*>& dependencies,
-                           const base::Closure& callback);
-
-  void set_dependency_catcher(DartDependencyCatcher* dependency_catcher) {
-    DCHECK(!dependency_catcher_ || !dependency_catcher);
-    dependency_catcher_ = dependency_catcher;
-  }
-
-  DartState* dart_state() const { return dart_state_.get(); }
-
- private:
-  class Job;
-  class ImportJob;
-  class SourceJob;
-  class DependencyWatcher;
-  class WatcherSignaler;
-
-  Dart_Handle Import(Dart_Handle library, Dart_Handle url);
-  Dart_Handle Source(Dart_Handle library, Dart_Handle url);
-  void DidCompleteImportJob(ImportJob* job, const Vector<uint8_t>& buffer);
-  void DidCompleteSourceJob(SourceJob* job, const Vector<uint8_t>& buffer);
-  void DidFailJob(Job* job);
-
-  base::WeakPtr<DartState> dart_state_;
-  HashMap<String, Job*> pending_libraries_;
-  HashSet<OwnPtr<Job>> jobs_;
-  HashSet<OwnPtr<DependencyWatcher>> dependency_watchers_;
-  DartDependencyCatcher* dependency_catcher_;
-
-  DISALLOW_COPY_AND_ASSIGN(DartLoader);
-};
-
-}  // namespace blink
-
-#endif  // SKY_ENGINE_CORE_SCRIPT_DART_LOADER_H_