diff --git a/BUILD.gn b/BUILD.gn
index 91709a0e558a9511d4ba747aacd7df3fa2bd13c9..699af81e24c7313b5fc23d77da78a494445228f7 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -48,7 +48,6 @@ group("flutter") {
       "$flutter_root/shell/platform/embedder:flutter_engine",
       "$flutter_root/synchronization:synchronization_unittests",
       "$flutter_root/third_party/txt:txt_unittests",
-      "//garnet/public/lib/fxl:fxl_unittests",
     ]
   }
 }
diff --git a/DEPS b/DEPS
index a4419555160c8e4725f30e70c62f76987711e2ed..e8e8c5e343e6f051b551017b1bb038b55e6dad8b 100644
--- a/DEPS
+++ b/DEPS
@@ -122,9 +122,6 @@ deps = {
    # build. Eventually, we'll manage these dependencies together with Fuchsia
    # and not have to specific specific hashes.
 
-  'src/garnet':
-   Var('fuchsia_git') + '/garnet' + '@' + 'b7492b5f34e32248b164eb48ae8e67995aebda67',
-
   'src/third_party/tonic':
    Var('fuchsia_git') + '/tonic' + '@' + '57d508b12462db686573edcbc97891d90cf92f90',
 
diff --git a/common/BUILD.gn b/common/BUILD.gn
index 47cd7d3d626446d722b558bde8befd1010f35b28..c0212e3528920b68b6230aea54dbd6b130a252a6 100644
--- a/common/BUILD.gn
+++ b/common/BUILD.gn
@@ -18,7 +18,6 @@ source_set("common") {
 
   deps = [
     "$flutter_root/fml",
-    "//garnet/public/lib/fxl",
   ]
 
   public_configs = [
diff --git a/common/settings.h b/common/settings.h
index 547673529ee1e13ab412370c0c825da44e10805f..124529b90c57d696a9833b058951f46aedfc5d9b 100644
--- a/common/settings.h
+++ b/common/settings.h
@@ -12,13 +12,13 @@
 #include <string>
 #include <vector>
 
+#include "flutter/fml/closure.h"
 #include "flutter/fml/unique_fd.h"
-#include "lib/fxl/functional/closure.h"
 
 namespace blink {
 
 using TaskObserverAdd =
-    std::function<void(intptr_t /* key */, fxl::Closure /* callback */)>;
+    std::function<void(intptr_t /* key */, fml::closure /* callback */)>;
 using TaskObserverRemove = std::function<void(intptr_t /* key */)>;
 
 struct Settings {
@@ -70,10 +70,10 @@ struct Settings {
   TaskObserverRemove task_observer_remove;
   // The main isolate is current when this callback is made. This is a good spot
   // to perform native Dart bindings for libraries not built in.
-  fxl::Closure root_isolate_create_callback;
+  fml::closure root_isolate_create_callback;
   // The isolate is not current and may have already been destroyed when this
   // call is made.
-  fxl::Closure root_isolate_shutdown_callback;
+  fml::closure root_isolate_shutdown_callback;
   bool enable_software_rendering = false;
   bool skia_deterministic_rendering_on_cpu = false;
   bool verbose_logging = false;
diff --git a/common/task_runners.cc b/common/task_runners.cc
index 1a09daec1815c14e48f7d4edf14d8f6469f8ad16..bb62c8e9c04e3976bd06fdd0f5e14b5f16aec151 100644
--- a/common/task_runners.cc
+++ b/common/task_runners.cc
@@ -9,10 +9,10 @@
 namespace blink {
 
 TaskRunners::TaskRunners(std::string label,
-                         fxl::RefPtr<fxl::TaskRunner> platform,
-                         fxl::RefPtr<fxl::TaskRunner> gpu,
-                         fxl::RefPtr<fxl::TaskRunner> ui,
-                         fxl::RefPtr<fxl::TaskRunner> io)
+                         fml::RefPtr<fml::TaskRunner> platform,
+                         fml::RefPtr<fml::TaskRunner> gpu,
+                         fml::RefPtr<fml::TaskRunner> ui,
+                         fml::RefPtr<fml::TaskRunner> io)
     : label_(std::move(label)),
       platform_(std::move(platform)),
       gpu_(std::move(gpu)),
@@ -25,19 +25,19 @@ const std::string& TaskRunners::GetLabel() const {
   return label_;
 }
 
-fxl::RefPtr<fxl::TaskRunner> TaskRunners::GetPlatformTaskRunner() const {
+fml::RefPtr<fml::TaskRunner> TaskRunners::GetPlatformTaskRunner() const {
   return platform_;
 }
 
-fxl::RefPtr<fxl::TaskRunner> TaskRunners::GetUITaskRunner() const {
+fml::RefPtr<fml::TaskRunner> TaskRunners::GetUITaskRunner() const {
   return ui_;
 }
 
-fxl::RefPtr<fxl::TaskRunner> TaskRunners::GetIOTaskRunner() const {
+fml::RefPtr<fml::TaskRunner> TaskRunners::GetIOTaskRunner() const {
   return io_;
 }
 
-fxl::RefPtr<fxl::TaskRunner> TaskRunners::GetGPUTaskRunner() const {
+fml::RefPtr<fml::TaskRunner> TaskRunners::GetGPUTaskRunner() const {
   return gpu_;
 }
 
diff --git a/common/task_runners.h b/common/task_runners.h
index f41ae147ebad0765176dac007fdd90c328b9250e..642a8a158f12d374717f1bc77ac5da50a150bab8 100644
--- a/common/task_runners.h
+++ b/common/task_runners.h
@@ -7,40 +7,41 @@
 
 #include <string>
 
-#include "lib/fxl/macros.h"
-#include "lib/fxl/tasks/task_runner.h"
+#include "flutter/fml/macros.h"
+#include "flutter/fml/task_runner.h"
 
 namespace blink {
 
 class TaskRunners {
  public:
   TaskRunners(std::string label,
-              fxl::RefPtr<fxl::TaskRunner> platform,
-              fxl::RefPtr<fxl::TaskRunner> gpu,
-              fxl::RefPtr<fxl::TaskRunner> ui,
-              fxl::RefPtr<fxl::TaskRunner> io);
+              fml::RefPtr<fml::TaskRunner> platform,
+              fml::RefPtr<fml::TaskRunner> gpu,
+              fml::RefPtr<fml::TaskRunner> ui,
+              fml::RefPtr<fml::TaskRunner> io);
 
   ~TaskRunners();
 
   const std::string& GetLabel() const;
 
-  fxl::RefPtr<fxl::TaskRunner> GetPlatformTaskRunner() const;
+  fml::RefPtr<fml::TaskRunner> GetPlatformTaskRunner() const;
 
-  fxl::RefPtr<fxl::TaskRunner> GetUITaskRunner() const;
+  fml::RefPtr<fml::TaskRunner> GetUITaskRunner() const;
 
-  fxl::RefPtr<fxl::TaskRunner> GetIOTaskRunner() const;
+  fml::RefPtr<fml::TaskRunner> GetIOTaskRunner() const;
 
-  fxl::RefPtr<fxl::TaskRunner> GetGPUTaskRunner() const;
+  fml::RefPtr<fml::TaskRunner> GetGPUTaskRunner() const;
 
   bool IsValid() const;
 
  private:
   const std::string label_;
-  fxl::RefPtr<fxl::TaskRunner> platform_;
-  fxl::RefPtr<fxl::TaskRunner> gpu_;
-  fxl::RefPtr<fxl::TaskRunner> ui_;
-  fxl::RefPtr<fxl::TaskRunner> io_;
+  fml::RefPtr<fml::TaskRunner> platform_;
+  fml::RefPtr<fml::TaskRunner> gpu_;
+  fml::RefPtr<fml::TaskRunner> ui_;
+  fml::RefPtr<fml::TaskRunner> io_;
 };
+
 }  // namespace blink
 
 #endif  // FLUTTER_COMMON_TASK_RUNNERS_H_
diff --git a/flow/BUILD.gn b/flow/BUILD.gn
index a63dfad95ddfc04275a1e3edb11b6f900306969f..77853058e14a57add78e112fe7efdf96b9a6f0b0 100644
--- a/flow/BUILD.gn
+++ b/flow/BUILD.gn
@@ -58,10 +58,6 @@ source_set("flow") {
     "texture.h",
   ]
 
-  public_deps = [
-    "//garnet/public/lib/fxl",
-  ]
-
   public_configs = [ "$flutter_root:config" ]
 
   deps = [
diff --git a/flow/compositor_context.h b/flow/compositor_context.h
index 14c2449dbecd066cab008912abcd2c7f4de3956a..5a6700ff3186f5589abaddf23a6e9ac0dd15401f 100644
--- a/flow/compositor_context.h
+++ b/flow/compositor_context.h
@@ -11,7 +11,7 @@
 #include "flutter/flow/instrumentation.h"
 #include "flutter/flow/raster_cache.h"
 #include "flutter/flow/texture.h"
-#include "lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 
@@ -44,7 +44,7 @@ class CompositorContext {
     SkCanvas* canvas_;
     const bool instrumentation_enabled_;
 
-    FXL_DISALLOW_COPY_AND_ASSIGN(ScopedFrame);
+    FML_DISALLOW_COPY_AND_ASSIGN(ScopedFrame);
   };
 
   CompositorContext();
@@ -81,7 +81,7 @@ class CompositorContext {
 
   void EndFrame(ScopedFrame& frame, bool enable_instrumentation);
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(CompositorContext);
+  FML_DISALLOW_COPY_AND_ASSIGN(CompositorContext);
 };
 
 }  // namespace flow
diff --git a/flow/debug_print.h b/flow/debug_print.h
index 78a28fe38562ddaa06a90015adfbf537b6fc8caa..d58dcbed28bed35d69088f736a1bf3cc4f64e0a9 100644
--- a/flow/debug_print.h
+++ b/flow/debug_print.h
@@ -7,7 +7,7 @@
 
 #include "flutter/flow/matrix_decomposition.h"
 #include "flutter/flow/raster_cache_key.h"
-#include "lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkMatrix44.h"
 #include "third_party/skia/include/core/SkPoint3.h"
diff --git a/flow/export_node.cc b/flow/export_node.cc
index 9b4b62faea5c2e5b75889bf38835e54eb24dfdbd..e837f525f35c41a47277219947d696b07fe20d97 100644
--- a/flow/export_node.cc
+++ b/flow/export_node.cc
@@ -4,16 +4,16 @@
 
 #include "flutter/flow/export_node.h"
 
-#include "lib/fxl/functional/make_copyable.h"
+#include "flutter/fml/make_copyable.h"
 
 namespace flow {
 
 ExportNodeHolder::ExportNodeHolder(
-    fxl::RefPtr<fxl::TaskRunner> gpu_task_runner,
-    fxl::RefPtr<zircon::dart::Handle> export_token_handle)
+    fml::RefPtr<fml::TaskRunner> gpu_task_runner,
+    fml::RefPtr<zircon::dart::Handle> export_token_handle)
     : gpu_task_runner_(std::move(gpu_task_runner)),
       export_node_(std::make_unique<ExportNode>(export_token_handle)) {
-  FXL_DCHECK(gpu_task_runner_);
+  FML_DCHECK(gpu_task_runner_);
 }
 
 void ExportNodeHolder::Bind(SceneUpdateContext& context,
@@ -25,18 +25,18 @@ void ExportNodeHolder::Bind(SceneUpdateContext& context,
 
 ExportNodeHolder::~ExportNodeHolder() {
   gpu_task_runner_->PostTask(
-      fxl::MakeCopyable([export_node = std::move(export_node_)]() {
+      fml::MakeCopyable([export_node = std::move(export_node_)]() {
         export_node->Dispose(true);
       }));
 }
 
-ExportNode::ExportNode(fxl::RefPtr<zircon::dart::Handle> export_token_handle)
+ExportNode::ExportNode(fml::RefPtr<zircon::dart::Handle> export_token_handle)
     : export_token_(export_token_handle->ReleaseHandle()) {}
 
 ExportNode::~ExportNode() {
   // Ensure that we properly released the node.
-  FXL_DCHECK(!node_);
-  FXL_DCHECK(scene_update_context_ == nullptr);
+  FML_DCHECK(!node_);
+  FML_DCHECK(scene_update_context_ == nullptr);
 }
 
 void ExportNode::Bind(SceneUpdateContext& context,
@@ -57,9 +57,9 @@ void ExportNode::Bind(SceneUpdateContext& context,
   if (node_) {
     container.AddChild(*node_);
     node_->SetTranslation(offset.x(), offset.y(), 0.f);
-    node_->SetHitTestBehavior(hit_testable
-                                  ? fuchsia::ui::gfx::HitTestBehavior::kDefault
-                                  : fuchsia::ui::gfx::HitTestBehavior::kSuppress);
+    node_->SetHitTestBehavior(
+        hit_testable ? fuchsia::ui::gfx::HitTestBehavior::kDefault
+                     : fuchsia::ui::gfx::HitTestBehavior::kSuppress);
   }
 }
 
@@ -70,7 +70,7 @@ void ExportNode::Dispose(bool remove_from_scene_update_context) {
   // 1. A node was never created, or
   // 2. A node was created but was already dereferenced (i.e. Dispose has
   // already been called).
-  FXL_DCHECK(scene_update_context_ || !node_);
+  FML_DCHECK(scene_update_context_ || !node_);
 
   if (remove_from_scene_update_context && scene_update_context_) {
     scene_update_context_->RemoveExportNode(this);
diff --git a/flow/export_node.h b/flow/export_node.h
index 335d3ba92aba3e5f0de38833c2bb4a4485b3d849..c7a3db98aacc6338a832e18fae414f60f456a3ec 100644
--- a/flow/export_node.h
+++ b/flow/export_node.h
@@ -11,9 +11,9 @@
 
 #include "dart-pkg/zircon/sdk_ext/handle.h"
 #include "flutter/flow/scene_update_context.h"
-#include "lib/fxl/build_config.h"
-#include "lib/fxl/macros.h"
-#include "lib/fxl/memory/ref_counted.h"
+#include "flutter/fml/build_config.h"
+#include "flutter/fml/macros.h"
+#include "flutter/fml/memory/ref_counted.h"
 #include "lib/ui/scenic/cpp/resources.h"
 #include "third_party/flutter/fml/task_runner.h"
 #include "third_party/skia/include/core/SkPoint.h"
@@ -23,10 +23,10 @@ namespace flow {
 // Wrapper class for ExportNode to use on UI Thread. When ExportNodeHolder is
 // destroyed, a task is posted on the Rasterizer thread to dispose the resources
 // held by the ExportNode.
-class ExportNodeHolder : public fxl::RefCountedThreadSafe<ExportNodeHolder> {
+class ExportNodeHolder : public fml::RefCountedThreadSafe<ExportNodeHolder> {
  public:
-  ExportNodeHolder(fxl::RefPtr<fxl::TaskRunner> gpu_task_runner,
-                   fxl::RefPtr<zircon::dart::Handle> export_token_handle);
+  ExportNodeHolder(fml::RefPtr<fml::TaskRunner> gpu_task_runner,
+                   fml::RefPtr<zircon::dart::Handle> export_token_handle);
   ~ExportNodeHolder();
 
   // Calls Bind() on the wrapped ExportNode.
@@ -38,12 +38,12 @@ class ExportNodeHolder : public fxl::RefCountedThreadSafe<ExportNodeHolder> {
   ExportNode* export_node() { return export_node_.get(); }
 
  private:
-  fxl::RefPtr<fxl::TaskRunner> gpu_task_runner_;
+  fml::RefPtr<fml::TaskRunner> gpu_task_runner_;
   std::unique_ptr<ExportNode> export_node_;
 
-  FRIEND_MAKE_REF_COUNTED(ExportNodeHolder);
-  FRIEND_REF_COUNTED_THREAD_SAFE(ExportNodeHolder);
-  FXL_DISALLOW_COPY_AND_ASSIGN(ExportNodeHolder);
+  FML_FRIEND_MAKE_REF_COUNTED(ExportNodeHolder);
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(ExportNodeHolder);
+  FML_DISALLOW_COPY_AND_ASSIGN(ExportNodeHolder);
 };
 
 // Represents a node which is being exported from the session.
@@ -51,7 +51,7 @@ class ExportNodeHolder : public fxl::RefCountedThreadSafe<ExportNodeHolder> {
 // must be created and destroyed by the rasterizer thread.
 class ExportNode {
  public:
-  ExportNode(fxl::RefPtr<zircon::dart::Handle> export_token_handle);
+  ExportNode(fml::RefPtr<zircon::dart::Handle> export_token_handle);
 
   ~ExportNode();
 
@@ -75,7 +75,7 @@ class ExportNode {
   zx::eventpair export_token_;
   std::unique_ptr<scenic::EntityNode> node_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(ExportNode);
+  FML_DISALLOW_COPY_AND_ASSIGN(ExportNode);
 };
 
 }  // namespace flow
diff --git a/flow/instrumentation.cc b/flow/instrumentation.cc
index e3e9fbd5ec26b8176be6063a105789a4279eaf02..a032a0ab327776bb7aba898a56c603cde5364817 100644
--- a/flow/instrumentation.cc
+++ b/flow/instrumentation.cc
@@ -14,28 +14,28 @@ namespace flow {
 static const size_t kMaxSamples = 120;
 static const size_t kMaxFrameMarkers = 8;
 
-Stopwatch::Stopwatch() : start_(fxl::TimePoint::Now()), current_sample_(0) {
-  const fxl::TimeDelta delta = fxl::TimeDelta::Zero();
+Stopwatch::Stopwatch() : start_(fml::TimePoint::Now()), current_sample_(0) {
+  const fml::TimeDelta delta = fml::TimeDelta::Zero();
   laps_.resize(kMaxSamples, delta);
 }
 
 Stopwatch::~Stopwatch() = default;
 
 void Stopwatch::Start() {
-  start_ = fxl::TimePoint::Now();
+  start_ = fml::TimePoint::Now();
   current_sample_ = (current_sample_ + 1) % kMaxSamples;
 }
 
 void Stopwatch::Stop() {
-  laps_[current_sample_] = fxl::TimePoint::Now() - start_;
+  laps_[current_sample_] = fml::TimePoint::Now() - start_;
 }
 
-void Stopwatch::SetLapTime(const fxl::TimeDelta& delta) {
+void Stopwatch::SetLapTime(const fml::TimeDelta& delta) {
   current_sample_ = (current_sample_ + 1) % kMaxSamples;
   laps_[current_sample_] = delta;
 }
 
-const fxl::TimeDelta& Stopwatch::LastLap() const {
+const fml::TimeDelta& Stopwatch::LastLap() const {
   return laps_[(current_sample_ - 1) % kMaxSamples];
 }
 
@@ -51,8 +51,8 @@ static inline double UnitHeight(double frame_time_ms,
   return unitHeight;
 }
 
-fxl::TimeDelta Stopwatch::MaxDelta() const {
-  fxl::TimeDelta max_delta;
+fml::TimeDelta Stopwatch::MaxDelta() const {
+  fml::TimeDelta max_delta;
   for (size_t i = 0; i < kMaxSamples; i++) {
     if (laps_[i] > max_delta)
       max_delta = laps_[i];
@@ -148,8 +148,7 @@ void Stopwatch::Visualize(SkCanvas& canvas, const SkRect& rect) const {
       x + width * (static_cast<double>(current_sample_) / kMaxSamples);
 
   const auto marker_rect = SkRect::MakeLTRB(
-      sample_x, y,
-      sample_x + width * sample_unit_width, bottom);
+      sample_x, y, sample_x + width * sample_unit_width, bottom);
   canvas.drawRect(marker_rect, paint);
 }
 
diff --git a/flow/instrumentation.h b/flow/instrumentation.h
index 1692c8aec495557d8a567080fee0fc203f569de9..19f3b0cfd8bc85be3e65bc25e0066e0e43a1efcf 100644
--- a/flow/instrumentation.h
+++ b/flow/instrumentation.h
@@ -7,9 +7,9 @@
 
 #include <vector>
 
-#include "lib/fxl/macros.h"
-#include "lib/fxl/time/time_delta.h"
-#include "lib/fxl/time/time_point.h"
+#include "flutter/fml/macros.h"
+#include "flutter/fml/time/time_delta.h"
+#include "flutter/fml/time/time_point.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
 namespace flow {
@@ -22,11 +22,11 @@ class Stopwatch {
 
   ~Stopwatch();
 
-  const fxl::TimeDelta& LastLap() const;
+  const fml::TimeDelta& LastLap() const;
 
-  fxl::TimeDelta CurrentLap() const { return fxl::TimePoint::Now() - start_; }
+  fml::TimeDelta CurrentLap() const { return fml::TimePoint::Now() - start_; }
 
-  fxl::TimeDelta MaxDelta() const;
+  fml::TimeDelta MaxDelta() const;
 
   void Visualize(SkCanvas& canvas, const SkRect& rect) const;
 
@@ -34,14 +34,14 @@ class Stopwatch {
 
   void Stop();
 
-  void SetLapTime(const fxl::TimeDelta& delta);
+  void SetLapTime(const fml::TimeDelta& delta);
 
  private:
-  fxl::TimePoint start_;
-  std::vector<fxl::TimeDelta> laps_;
+  fml::TimePoint start_;
+  std::vector<fml::TimeDelta> laps_;
   size_t current_sample_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(Stopwatch);
+  FML_DISALLOW_COPY_AND_ASSIGN(Stopwatch);
 };
 
 class Counter {
@@ -57,7 +57,7 @@ class Counter {
  private:
   size_t count_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(Counter);
+  FML_DISALLOW_COPY_AND_ASSIGN(Counter);
 };
 
 class CounterValues {
@@ -80,7 +80,7 @@ class CounterValues {
   std::vector<int64_t> values_;
   size_t current_sample_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(CounterValues);
+  FML_DISALLOW_COPY_AND_ASSIGN(CounterValues);
 };
 
 }  // namespace flow
diff --git a/flow/layers/backdrop_filter_layer.cc b/flow/layers/backdrop_filter_layer.cc
index 5186284fcce35313eb7e0ff0682f86d238346a8e..b8d04803f1935bf0a0edb12afe62c3ebf787e60e 100644
--- a/flow/layers/backdrop_filter_layer.cc
+++ b/flow/layers/backdrop_filter_layer.cc
@@ -14,7 +14,7 @@ BackdropFilterLayer::~BackdropFilterLayer() = default;
 
 void BackdropFilterLayer::Paint(PaintContext& context) const {
   TRACE_EVENT0("flutter", "BackdropFilterLayer::Paint");
-  FXL_DCHECK(needs_painting());
+  FML_DCHECK(needs_painting());
 
   Layer::AutoSaveLayer(context, SkCanvas::SaveLayerRec{&paint_bounds(), nullptr,
                                                        filter_.get(), 0});
diff --git a/flow/layers/backdrop_filter_layer.h b/flow/layers/backdrop_filter_layer.h
index 00b1a22240541b2e052dbd2f9b980f78bc8789d5..a54f844a429e113fae0c63318e7ccd9a44f3c063 100644
--- a/flow/layers/backdrop_filter_layer.h
+++ b/flow/layers/backdrop_filter_layer.h
@@ -21,7 +21,7 @@ class BackdropFilterLayer : public ContainerLayer {
  private:
   sk_sp<SkImageFilter> filter_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(BackdropFilterLayer);
+  FML_DISALLOW_COPY_AND_ASSIGN(BackdropFilterLayer);
 };
 
 }  // namespace flow
diff --git a/flow/layers/child_scene_layer.cc b/flow/layers/child_scene_layer.cc
index 8b36ce09c64a3f1aaaf531d58cee0c250507fd01..744aee5e878883ed55b0eaf0e05234ae2d321939 100644
--- a/flow/layers/child_scene_layer.cc
+++ b/flow/layers/child_scene_layer.cc
@@ -19,7 +19,7 @@ void ChildSceneLayer::Paint(PaintContext& context) const {
 }
 
 void ChildSceneLayer::UpdateScene(SceneUpdateContext& context) {
-  FXL_DCHECK(needs_system_composite());
+  FML_DCHECK(needs_system_composite());
 
   // TODO(MZ-191): Set clip.
   // It's worth asking whether all children should be clipped implicitly
diff --git a/flow/layers/child_scene_layer.h b/flow/layers/child_scene_layer.h
index d28009095c02127480bce86e1df700d3f2e23e8a..b52ceb28b2d4f7c5968d16052ba26fb2aeaa7b1d 100644
--- a/flow/layers/child_scene_layer.h
+++ b/flow/layers/child_scene_layer.h
@@ -21,7 +21,7 @@ class ChildSceneLayer : public Layer {
   void set_size(const SkSize& size) { size_ = size; }
 
   void set_export_node_holder(
-      fxl::RefPtr<ExportNodeHolder> export_node_holder) {
+      fml::RefPtr<ExportNodeHolder> export_node_holder) {
     export_node_holder_ = std::move(export_node_holder);
   }
 
@@ -36,10 +36,10 @@ class ChildSceneLayer : public Layer {
  private:
   SkPoint offset_;
   SkSize size_;
-  fxl::RefPtr<ExportNodeHolder> export_node_holder_;
+  fml::RefPtr<ExportNodeHolder> export_node_holder_;
   bool hit_testable_ = true;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(ChildSceneLayer);
+  FML_DISALLOW_COPY_AND_ASSIGN(ChildSceneLayer);
 };
 
 }  // namespace flow
diff --git a/flow/layers/clip_path_layer.cc b/flow/layers/clip_path_layer.cc
index 5a234aa5ee103f923c44b226337eef6d0ca9a40f..3c71823c48503b1baf8a5aa1334a66f53be4afdf 100644
--- a/flow/layers/clip_path_layer.cc
+++ b/flow/layers/clip_path_layer.cc
@@ -29,7 +29,7 @@ void ClipPathLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
 #if defined(OS_FUCHSIA)
 
 void ClipPathLayer::UpdateScene(SceneUpdateContext& context) {
-  FXL_DCHECK(needs_system_composite());
+  FML_DCHECK(needs_system_composite());
 
   // TODO(MZ-140): Must be able to specify paths as shapes to nodes.
   //               Treating the shape as a rectangle for now.
@@ -48,7 +48,7 @@ void ClipPathLayer::UpdateScene(SceneUpdateContext& context) {
 
 void ClipPathLayer::Paint(PaintContext& context) const {
   TRACE_EVENT0("flutter", "ClipPathLayer::Paint");
-  FXL_DCHECK(needs_painting());
+  FML_DCHECK(needs_painting());
 
   SkAutoCanvasRestore save(&context.canvas, true);
   context.canvas.clipPath(clip_path_, clip_behavior_ != Clip::hardEdge);
diff --git a/flow/layers/clip_path_layer.h b/flow/layers/clip_path_layer.h
index 818285af8d098acd1cde1627e38c2f7149b469e8..33b043029ba10c0ec674f5557f7a5dffc3645c42 100644
--- a/flow/layers/clip_path_layer.h
+++ b/flow/layers/clip_path_layer.h
@@ -28,7 +28,7 @@ class ClipPathLayer : public ContainerLayer {
   SkPath clip_path_;
   Clip clip_behavior_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(ClipPathLayer);
+  FML_DISALLOW_COPY_AND_ASSIGN(ClipPathLayer);
 };
 
 }  // namespace flow
diff --git a/flow/layers/clip_rect_layer.cc b/flow/layers/clip_rect_layer.cc
index 6f345678f87a39e1712c0a246c53216bc352184b..bc9ce7d099badcd7e2b14641839842086a83338d 100644
--- a/flow/layers/clip_rect_layer.cc
+++ b/flow/layers/clip_rect_layer.cc
@@ -23,7 +23,7 @@ void ClipRectLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
 #if defined(OS_FUCHSIA)
 
 void ClipRectLayer::UpdateScene(SceneUpdateContext& context) {
-  FXL_DCHECK(needs_system_composite());
+  FML_DCHECK(needs_system_composite());
 
   scenic::Rectangle shape(context.session(),   // session
                           clip_rect_.width(),  //  width
@@ -39,7 +39,7 @@ void ClipRectLayer::UpdateScene(SceneUpdateContext& context) {
 
 void ClipRectLayer::Paint(PaintContext& context) const {
   TRACE_EVENT0("flutter", "ClipRectLayer::Paint");
-  FXL_DCHECK(needs_painting());
+  FML_DCHECK(needs_painting());
 
   SkAutoCanvasRestore save(&context.canvas, clip_behavior_ != Clip::hardEdge);
   context.canvas.clipRect(paint_bounds());
diff --git a/flow/layers/clip_rect_layer.h b/flow/layers/clip_rect_layer.h
index 0744076ec478b5fedb348bfa047725f76ed39ad3..576e6a5d029a75f66e82d848358e6c0aad3fae47 100644
--- a/flow/layers/clip_rect_layer.h
+++ b/flow/layers/clip_rect_layer.h
@@ -27,7 +27,7 @@ class ClipRectLayer : public ContainerLayer {
   SkRect clip_rect_;
   Clip clip_behavior_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(ClipRectLayer);
+  FML_DISALLOW_COPY_AND_ASSIGN(ClipRectLayer);
 };
 
 }  // namespace flow
diff --git a/flow/layers/clip_rrect_layer.cc b/flow/layers/clip_rrect_layer.cc
index d21ce637f7f75e854447375cb3c378ae59c12cb7..046a0d45404ef3108acddc9705c27e494fd6df88 100644
--- a/flow/layers/clip_rrect_layer.cc
+++ b/flow/layers/clip_rrect_layer.cc
@@ -23,7 +23,7 @@ void ClipRRectLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
 #if defined(OS_FUCHSIA)
 
 void ClipRRectLayer::UpdateScene(SceneUpdateContext& context) {
-  FXL_DCHECK(needs_system_composite());
+  FML_DCHECK(needs_system_composite());
 
   // TODO(MZ-137): Need to be able to express the radii as vectors.
   scenic::RoundedRectangle shape(
@@ -46,7 +46,7 @@ void ClipRRectLayer::UpdateScene(SceneUpdateContext& context) {
 
 void ClipRRectLayer::Paint(PaintContext& context) const {
   TRACE_EVENT0("flutter", "ClipRRectLayer::Paint");
-  FXL_DCHECK(needs_painting());
+  FML_DCHECK(needs_painting());
 
   SkAutoCanvasRestore save(&context.canvas, true);
   context.canvas.clipRRect(clip_rrect_, clip_behavior_ != Clip::hardEdge);
diff --git a/flow/layers/clip_rrect_layer.h b/flow/layers/clip_rrect_layer.h
index 7888a15ef838f94237a281ec2cb40cba8fa312cb..7e8f0934a337ff6f08298ba8f61de0cb673d9ba2 100644
--- a/flow/layers/clip_rrect_layer.h
+++ b/flow/layers/clip_rrect_layer.h
@@ -28,7 +28,7 @@ class ClipRRectLayer : public ContainerLayer {
   SkRRect clip_rrect_;
   Clip clip_behavior_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(ClipRRectLayer);
+  FML_DISALLOW_COPY_AND_ASSIGN(ClipRRectLayer);
 };
 
 }  // namespace flow
diff --git a/flow/layers/color_filter_layer.cc b/flow/layers/color_filter_layer.cc
index 6b1330eb405935573baac4da7dc83905733bb333..a3c678aa1539e3c34b62b3f83c3ff7d5d04130bb 100644
--- a/flow/layers/color_filter_layer.cc
+++ b/flow/layers/color_filter_layer.cc
@@ -12,7 +12,7 @@ ColorFilterLayer::~ColorFilterLayer() = default;
 
 void ColorFilterLayer::Paint(PaintContext& context) const {
   TRACE_EVENT0("flutter", "ColorFilterLayer::Paint");
-  FXL_DCHECK(needs_painting());
+  FML_DCHECK(needs_painting());
 
   sk_sp<SkColorFilter> color_filter =
       SkColorFilter::MakeModeFilter(color_, blend_mode_);
diff --git a/flow/layers/color_filter_layer.h b/flow/layers/color_filter_layer.h
index dcd7543b55d5391eae8e8d45a46954ae6fbc2328..e129bad66f000b6e1a8e713c97a5c3b7e83be85e 100644
--- a/flow/layers/color_filter_layer.h
+++ b/flow/layers/color_filter_layer.h
@@ -24,7 +24,7 @@ class ColorFilterLayer : public ContainerLayer {
   SkColor color_;
   SkBlendMode blend_mode_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(ColorFilterLayer);
+  FML_DISALLOW_COPY_AND_ASSIGN(ColorFilterLayer);
 };
 
 }  // namespace flow
diff --git a/flow/layers/container_layer.cc b/flow/layers/container_layer.cc
index b437d4369bf1148f46510a5020ae5a870b7d436f..f398c96ad1afe5504592f2f95569750ceb05b625 100644
--- a/flow/layers/container_layer.cc
+++ b/flow/layers/container_layer.cc
@@ -38,7 +38,7 @@ void ContainerLayer::PrerollChildren(PrerollContext* context,
 }
 
 void ContainerLayer::PaintChildren(PaintContext& context) const {
-  FXL_DCHECK(needs_painting());
+  FML_DCHECK(needs_painting());
 
   // Intentionally not tracing here as there should be no self-time
   // and the trace event on this common function has a small overhead.
@@ -56,7 +56,7 @@ void ContainerLayer::UpdateScene(SceneUpdateContext& context) {
 }
 
 void ContainerLayer::UpdateSceneChildren(SceneUpdateContext& context) {
-  FXL_DCHECK(needs_system_composite());
+  FML_DCHECK(needs_system_composite());
 
   // Paint all of the layers which need to be drawn into the container.
   // These may be flattened down to a containing
diff --git a/flow/layers/container_layer.h b/flow/layers/container_layer.h
index 9b30d28c9f44a22960affe48d1029419619423e5..0da0a7185963ed9df3dbae97ad08c88be23817e3 100644
--- a/flow/layers/container_layer.h
+++ b/flow/layers/container_layer.h
@@ -38,7 +38,7 @@ class ContainerLayer : public Layer {
  private:
   std::vector<std::unique_ptr<Layer>> layers_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(ContainerLayer);
+  FML_DISALLOW_COPY_AND_ASSIGN(ContainerLayer);
 };
 
 }  // namespace flow
diff --git a/flow/layers/default_layer_builder.cc b/flow/layers/default_layer_builder.cc
index 031bf24d9b26236c7da84278ff91a13ced5f3f59..33fac9704bb662b9a1358646535d829e448d8a17 100644
--- a/flow/layers/default_layer_builder.cc
+++ b/flow/layers/default_layer_builder.cc
@@ -72,7 +72,7 @@ void DefaultLayerBuilder::PushClipRoundedRect(const SkRRect& rrect,
 }
 
 void DefaultLayerBuilder::PushClipPath(const SkPath& path, Clip clip_behavior) {
-  FXL_DCHECK(clip_behavior != Clip::none);
+  FML_DCHECK(clip_behavior != Clip::none);
   SkRect cullRect;
   if (!cullRect.intersect(path.getBounds(), cull_rects_.top())) {
     cullRect = SkRect::MakeEmpty();
@@ -178,7 +178,7 @@ void DefaultLayerBuilder::PushTexture(const SkPoint& offset,
 void DefaultLayerBuilder::PushChildScene(
     const SkPoint& offset,
     const SkSize& size,
-    fxl::RefPtr<flow::ExportNodeHolder> export_token_holder,
+    fml::RefPtr<flow::ExportNodeHolder> export_token_holder,
     bool hit_testable) {
   if (!current_layer_) {
     return;
@@ -211,7 +211,7 @@ std::unique_ptr<flow::Layer> DefaultLayerBuilder::TakeLayer() {
 
 void DefaultLayerBuilder::PushLayer(std::unique_ptr<flow::ContainerLayer> layer,
                                     const SkRect& cullRect) {
-  FXL_DCHECK(layer);
+  FML_DCHECK(layer);
 
   cull_rects_.push(cullRect);
 
diff --git a/flow/layers/default_layer_builder.h b/flow/layers/default_layer_builder.h
index d5a2643a5a3895b88b88d850172ab1d4ffa32eb5..0dd87a3dd75a8ac8c67bab2fb95cd695ef5d5e88 100644
--- a/flow/layers/default_layer_builder.h
+++ b/flow/layers/default_layer_builder.h
@@ -9,7 +9,7 @@
 
 #include "flutter/flow/layers/container_layer.h"
 #include "flutter/flow/layers/layer_builder.h"
-#include "garnet/public/lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 
 namespace flow {
 
@@ -76,7 +76,7 @@ class DefaultLayerBuilder final : public LayerBuilder {
   // |flow::LayerBuilder|
   void PushChildScene(const SkPoint& offset,
                       const SkSize& size,
-                      fxl::RefPtr<flow::ExportNodeHolder> export_token_holder,
+                      fml::RefPtr<flow::ExportNodeHolder> export_token_holder,
                       bool hit_testable) override;
 #endif  // defined(OS_FUCHSIA)
 
@@ -95,7 +95,7 @@ class DefaultLayerBuilder final : public LayerBuilder {
   void PushLayer(std::unique_ptr<flow::ContainerLayer> layer,
                  const SkRect& cullRect);
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(DefaultLayerBuilder);
+  FML_DISALLOW_COPY_AND_ASSIGN(DefaultLayerBuilder);
 };
 
 }  // namespace flow
diff --git a/flow/layers/layer.h b/flow/layers/layer.h
index d1a4f0ba13905bf9555fac2ffba6527289529758..173c2890b6ae88a16fa804253f4b044900a6c668 100644
--- a/flow/layers/layer.h
+++ b/flow/layers/layer.h
@@ -11,10 +11,10 @@
 #include "flutter/flow/instrumentation.h"
 #include "flutter/flow/raster_cache.h"
 #include "flutter/flow/texture.h"
+#include "flutter/fml/build_config.h"
+#include "flutter/fml/logging.h"
+#include "flutter/fml/macros.h"
 #include "flutter/fml/trace_event.h"
-#include "lib/fxl/build_config.h"
-#include "lib/fxl/logging.h"
-#include "lib/fxl/macros.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
@@ -112,7 +112,7 @@ class Layer {
   bool needs_system_composite_;
   SkRect paint_bounds_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(Layer);
+  FML_DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace flow
diff --git a/flow/layers/layer_builder.h b/flow/layers/layer_builder.h
index 3cb6ea1fb40ced33611216349087c3d849f6c8ee..c1b34bf306434eda7d27f6f41bf63485699017ad 100644
--- a/flow/layers/layer_builder.h
+++ b/flow/layers/layer_builder.h
@@ -9,7 +9,7 @@
 
 #include "flutter/flow/layers/layer.h"
 #include "flutter/flow/skia_gpu_object.h"
-#include "garnet/public/lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 #include "third_party/skia/include/core/SkBlendMode.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
@@ -74,7 +74,7 @@ class LayerBuilder {
   virtual void PushChildScene(
       const SkPoint& offset,
       const SkSize& size,
-      fxl::RefPtr<flow::ExportNodeHolder> export_token_holder,
+      fml::RefPtr<flow::ExportNodeHolder> export_token_holder,
       bool hit_testable) = 0;
 #endif  // defined(OS_FUCHSIA)
 
@@ -99,7 +99,7 @@ class LayerBuilder {
   bool checkerboard_raster_cache_images_ = false;
   bool checkerboard_offscreen_layers_ = false;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(LayerBuilder);
+  FML_DISALLOW_COPY_AND_ASSIGN(LayerBuilder);
 };
 
 }  // namespace flow
diff --git a/flow/layers/layer_tree.h b/flow/layers/layer_tree.h
index 522fe6a34f393193957259a0002af56b44cc6c7d..bae883ca207be807cc51b6ad5ba71b2eda02008d 100644
--- a/flow/layers/layer_tree.h
+++ b/flow/layers/layer_tree.h
@@ -11,8 +11,8 @@
 
 #include "flutter/flow/compositor_context.h"
 #include "flutter/flow/layers/layer.h"
-#include "lib/fxl/macros.h"
-#include "lib/fxl/time/time_delta.h"
+#include "flutter/fml/macros.h"
+#include "flutter/fml/time/time_delta.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkSize.h"
 
@@ -46,11 +46,11 @@ class LayerTree {
 
   void set_frame_size(const SkISize& frame_size) { frame_size_ = frame_size; }
 
-  void set_construction_time(const fxl::TimeDelta& delta) {
+  void set_construction_time(const fml::TimeDelta& delta) {
     construction_time_ = delta;
   }
 
-  const fxl::TimeDelta& construction_time() const { return construction_time_; }
+  const fml::TimeDelta& construction_time() const { return construction_time_; }
 
   // The number of frame intervals missed after which the compositor must
   // trace the rasterized picture to a trace file. Specify 0 to disable all
@@ -74,12 +74,12 @@ class LayerTree {
  private:
   SkISize frame_size_;  // Physical pixels.
   std::unique_ptr<Layer> root_layer_;
-  fxl::TimeDelta construction_time_;
+  fml::TimeDelta construction_time_;
   uint32_t rasterizer_tracing_threshold_;
   bool checkerboard_raster_cache_images_;
   bool checkerboard_offscreen_layers_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(LayerTree);
+  FML_DISALLOW_COPY_AND_ASSIGN(LayerTree);
 };
 
 }  // namespace flow
diff --git a/flow/layers/opacity_layer.cc b/flow/layers/opacity_layer.cc
index e6916f07620364b162bff28434ae970144fa6e60..84b8bd64c0224d91ea2961a5b6b949b2ab111b89 100644
--- a/flow/layers/opacity_layer.cc
+++ b/flow/layers/opacity_layer.cc
@@ -12,7 +12,7 @@ OpacityLayer::~OpacityLayer() = default;
 
 void OpacityLayer::Paint(PaintContext& context) const {
   TRACE_EVENT0("flutter", "OpacityLayer::Paint");
-  FXL_DCHECK(needs_painting());
+  FML_DCHECK(needs_painting());
 
   SkPaint paint;
   paint.setAlpha(alpha_);
diff --git a/flow/layers/opacity_layer.h b/flow/layers/opacity_layer.h
index 2ec0a1acf9a0750ad0effc04a4920dcdac69ffb8..b27829385046bda24df8b840f646c62ecbf5bbfa 100644
--- a/flow/layers/opacity_layer.h
+++ b/flow/layers/opacity_layer.h
@@ -24,7 +24,7 @@ class OpacityLayer : public ContainerLayer {
  private:
   int alpha_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(OpacityLayer);
+  FML_DISALLOW_COPY_AND_ASSIGN(OpacityLayer);
 };
 
 }  // namespace flow
diff --git a/flow/layers/performance_overlay_layer.h b/flow/layers/performance_overlay_layer.h
index 77448107147a49ab71461ed7f5984b4a555580e7..3296a308bddbd8046cf8f8fc3042f3024d9cc60c 100644
--- a/flow/layers/performance_overlay_layer.h
+++ b/flow/layers/performance_overlay_layer.h
@@ -6,7 +6,7 @@
 #define FLUTTER_FLOW_LAYERS_PERFORMANCE_OVERLAY_LAYER_H_
 
 #include "flutter/flow/layers/layer.h"
-#include "lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 
 namespace flow {
 
@@ -24,7 +24,7 @@ class PerformanceOverlayLayer : public Layer {
  private:
   int options_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(PerformanceOverlayLayer);
+  FML_DISALLOW_COPY_AND_ASSIGN(PerformanceOverlayLayer);
 };
 
 }  // namespace flow
diff --git a/flow/layers/physical_shape_layer.cc b/flow/layers/physical_shape_layer.cc
index 8f9e59d6f1ac2f87e10747c8b0122f406e7eec0a..53a7d29f30df414a2d3424d33ec95cd08a7fc9bb 100644
--- a/flow/layers/physical_shape_layer.cc
+++ b/flow/layers/physical_shape_layer.cc
@@ -64,7 +64,7 @@ void PhysicalShapeLayer::Preroll(PrerollContext* context,
 #if defined(OS_FUCHSIA)
 
 void PhysicalShapeLayer::UpdateScene(SceneUpdateContext& context) {
-  FXL_DCHECK(needs_system_composite());
+  FML_DCHECK(needs_system_composite());
 
   SceneUpdateContext::Frame frame(context, frameRRect_, color_, elevation_);
   for (auto& layer : layers()) {
@@ -80,7 +80,7 @@ void PhysicalShapeLayer::UpdateScene(SceneUpdateContext& context) {
 
 void PhysicalShapeLayer::Paint(PaintContext& context) const {
   TRACE_EVENT0("flutter", "PhysicalShapeLayer::Paint");
-  FXL_DCHECK(needs_painting());
+  FML_DCHECK(needs_painting());
 
   if (elevation_ != 0) {
     DrawShadow(&context.canvas, path_, shadow_color_, elevation_,
diff --git a/flow/layers/picture_layer.cc b/flow/layers/picture_layer.cc
index bef944e7f34a97bd6d1da5638ce343454ad5e4da..3cbf15a609ad1c78bfd5edd01f2e960faf478a01 100644
--- a/flow/layers/picture_layer.cc
+++ b/flow/layers/picture_layer.cc
@@ -4,7 +4,7 @@
 
 #include "flutter/flow/layers/picture_layer.h"
 
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 
 namespace flow {
 
@@ -34,8 +34,8 @@ void PictureLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
 
 void PictureLayer::Paint(PaintContext& context) const {
   TRACE_EVENT0("flutter", "PictureLayer::Paint");
-  FXL_DCHECK(picture_.get());
-  FXL_DCHECK(needs_painting());
+  FML_DCHECK(picture_.get());
+  FML_DCHECK(needs_painting());
 
   SkAutoCanvasRestore save(&context.canvas, true);
   context.canvas.translate(offset_.x(), offset_.y());
diff --git a/flow/layers/picture_layer.h b/flow/layers/picture_layer.h
index c67929b7cb45502ae912460b177bff66d6d967d2..12e2807c33d23ae57f4d59e834b07e0d102e26a4 100644
--- a/flow/layers/picture_layer.h
+++ b/flow/layers/picture_layer.h
@@ -41,7 +41,7 @@ class PictureLayer : public Layer {
   bool will_change_ = false;
   RasterCacheResult raster_cache_result_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(PictureLayer);
+  FML_DISALLOW_COPY_AND_ASSIGN(PictureLayer);
 };
 
 }  // namespace flow
diff --git a/flow/layers/shader_mask_layer.cc b/flow/layers/shader_mask_layer.cc
index 4ed67334b8326904525d94bc29202a34f6cbe81d..3ea69322fcd2f2fe66dbeb2f4fc4502db52f1ada 100644
--- a/flow/layers/shader_mask_layer.cc
+++ b/flow/layers/shader_mask_layer.cc
@@ -12,7 +12,7 @@ ShaderMaskLayer::~ShaderMaskLayer() = default;
 
 void ShaderMaskLayer::Paint(PaintContext& context) const {
   TRACE_EVENT0("flutter", "ShaderMaskLayer::Paint");
-  FXL_DCHECK(needs_painting());
+  FML_DCHECK(needs_painting());
 
   Layer::AutoSaveLayer(context, paint_bounds(), nullptr);
   PaintChildren(context);
diff --git a/flow/layers/shader_mask_layer.h b/flow/layers/shader_mask_layer.h
index 0b9e728cdda11b5ec4c6739f8aae77f87b8903ee..ed059722fea55313ecf9f9dc756bdc9053ccdd36 100644
--- a/flow/layers/shader_mask_layer.h
+++ b/flow/layers/shader_mask_layer.h
@@ -29,7 +29,7 @@ class ShaderMaskLayer : public ContainerLayer {
   SkRect mask_rect_;
   SkBlendMode blend_mode_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(ShaderMaskLayer);
+  FML_DISALLOW_COPY_AND_ASSIGN(ShaderMaskLayer);
 };
 
 }  // namespace flow
diff --git a/flow/layers/texture_layer.h b/flow/layers/texture_layer.h
index 75f0fe66abaecd148c7647ba9255eecb3dd3ba92..93581c3472b0e24835732ff5d1864c78b1746bb4 100644
--- a/flow/layers/texture_layer.h
+++ b/flow/layers/texture_layer.h
@@ -31,7 +31,7 @@ class TextureLayer : public Layer {
   SkSize size_;
   int64_t texture_id_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(TextureLayer);
+  FML_DISALLOW_COPY_AND_ASSIGN(TextureLayer);
 };
 
 }  // namespace flow
diff --git a/flow/layers/transform_layer.cc b/flow/layers/transform_layer.cc
index be6a6f81c478c556bfd9377918629bd2f4978b9e..a70cc299dd9a431ca9cdb4645063d03954555e92 100644
--- a/flow/layers/transform_layer.cc
+++ b/flow/layers/transform_layer.cc
@@ -24,7 +24,7 @@ void TransformLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
 #if defined(OS_FUCHSIA)
 
 void TransformLayer::UpdateScene(SceneUpdateContext& context) {
-  FXL_DCHECK(needs_system_composite());
+  FML_DCHECK(needs_system_composite());
 
   SceneUpdateContext::Transform transform(context, transform_);
   UpdateSceneChildren(context);
@@ -34,7 +34,7 @@ void TransformLayer::UpdateScene(SceneUpdateContext& context) {
 
 void TransformLayer::Paint(PaintContext& context) const {
   TRACE_EVENT0("flutter", "TransformLayer::Paint");
-  FXL_DCHECK(needs_painting());
+  FML_DCHECK(needs_painting());
 
   SkAutoCanvasRestore save(&context.canvas, true);
   context.canvas.concat(transform_);
diff --git a/flow/layers/transform_layer.h b/flow/layers/transform_layer.h
index 47fd7d5cefc0c5088cf741ae44deb8624e70b858..f8209302aa170d60776ce7132982ca87c9696c5c 100644
--- a/flow/layers/transform_layer.h
+++ b/flow/layers/transform_layer.h
@@ -27,7 +27,7 @@ class TransformLayer : public ContainerLayer {
  private:
   SkMatrix transform_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(TransformLayer);
+  FML_DISALLOW_COPY_AND_ASSIGN(TransformLayer);
 };
 
 }  // namespace flow
diff --git a/flow/matrix_decomposition.h b/flow/matrix_decomposition.h
index 1392ed8aad020445541bae6bbc9ad2d2aaf62fce..d65d12a77e67444c20f57625c9acceff25bf79cc 100644
--- a/flow/matrix_decomposition.h
+++ b/flow/matrix_decomposition.h
@@ -5,7 +5,7 @@
 #ifndef FLUTTER_FLOW_MATRIX_DECOMPOSITION_H_
 #define FLUTTER_FLOW_MATRIX_DECOMPOSITION_H_
 
-#include "lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkMatrix44.h"
 #include "third_party/skia/include/core/SkPoint3.h"
@@ -43,7 +43,7 @@ class MatrixDecomposition {
   SkVector4 perspective_;
   SkVector4 rotation_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(MatrixDecomposition);
+  FML_DISALLOW_COPY_AND_ASSIGN(MatrixDecomposition);
 };
 
 }  // namespace flow
diff --git a/flow/matrix_decomposition_unittests.cc b/flow/matrix_decomposition_unittests.cc
index df8009088151291979f4fe81b15295c345210e1e..130f290d583990770c0181947d5ad432c9652f9d 100644
--- a/flow/matrix_decomposition_unittests.cc
+++ b/flow/matrix_decomposition_unittests.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "lib/fxl/build_config.h"
+#include "flutter/fml/build_config.h"
 
 #if defined(OS_WIN)
 #define _USE_MATH_DEFINES
diff --git a/flow/raster_cache.cc b/flow/raster_cache.cc
index 33d5a99d2c6d5a57b1f500d1e2dce4e27c26d4e2..a3aef6e3d14107a6941fec2d8ff00e17c205b1d9 100644
--- a/flow/raster_cache.cc
+++ b/flow/raster_cache.cc
@@ -7,8 +7,8 @@
 #include <vector>
 
 #include "flutter/flow/paint_utils.h"
+#include "flutter/fml/logging.h"
 #include "flutter/fml/trace_event.h"
-#include "lib/fxl/logging.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColorSpaceXformCanvas.h"
 #include "third_party/skia/include/core/SkImage.h"
@@ -21,7 +21,7 @@ void RasterCacheResult::draw(SkCanvas& canvas) const {
   SkAutoCanvasRestore auto_restore(&canvas, true);
   SkIRect bounds =
       RasterCache::GetDeviceBounds(logical_rect_, canvas.getTotalMatrix());
-  FXL_DCHECK(bounds.size() == image_->dimensions());
+  FML_DCHECK(bounds.size() == image_->dimensions());
   canvas.resetMatrix();
   canvas.drawImage(image_, bounds.fLeft, bounds.fTop);
 }
diff --git a/flow/raster_cache.h b/flow/raster_cache.h
index e72e7437098f4100b5eace38bbd0c1153e0cb4f6..348ab8000da399209db0db81a47a0f67fb6bb85d 100644
--- a/flow/raster_cache.h
+++ b/flow/raster_cache.h
@@ -10,8 +10,8 @@
 
 #include "flutter/flow/instrumentation.h"
 #include "flutter/flow/raster_cache_key.h"
-#include "lib/fxl/macros.h"
-#include "lib/fxl/memory/weak_ptr.h"
+#include "flutter/fml/macros.h"
+#include "flutter/fml/memory/weak_ptr.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkSize.h"
 
@@ -79,9 +79,9 @@ class RasterCache {
   const size_t threshold_;
   RasterCacheKey::Map<Entry> cache_;
   bool checkerboard_images_;
-  fxl::WeakPtrFactory<RasterCache> weak_factory_;
+  fml::WeakPtrFactory<RasterCache> weak_factory_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(RasterCache);
+  FML_DISALLOW_COPY_AND_ASSIGN(RasterCache);
 };
 
 }  // namespace flow
diff --git a/flow/raster_cache_key.h b/flow/raster_cache_key.h
index c6f4c759378f011ed2ac0d82b76e07954137f60b..3f20072df8e3bbac588b39d5422d7afc9f027637 100644
--- a/flow/raster_cache_key.h
+++ b/flow/raster_cache_key.h
@@ -7,8 +7,8 @@
 
 #include <unordered_map>
 #include "flutter/flow/matrix_decomposition.h"
-#include "lib/fxl/logging.h"
-#include "lib/fxl/macros.h"
+#include "flutter/fml/logging.h"
+#include "flutter/fml/macros.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
@@ -21,7 +21,7 @@ class RasterCacheKey {
     matrix_[SkMatrix::kMTransX] = SkScalarFraction(ctm.getTranslateX());
     matrix_[SkMatrix::kMTransY] = SkScalarFraction(ctm.getTranslateY());
 #ifndef SUPPORT_FRACTIONAL_TRANSLATION
-    FXL_DCHECK(matrix_.getTranslateX() == 0 && matrix_.getTranslateY() == 0);
+    FML_DCHECK(matrix_.getTranslateX() == 0 && matrix_.getTranslateY() == 0);
 #endif
   }
 
diff --git a/flow/scene_update_context.cc b/flow/scene_update_context.cc
index c4cb57e59afea1c34380900967eb8b89544e4b0f..576bde7fa1aff1e0ee25b9b22404b350fe0aa7a9 100644
--- a/flow/scene_update_context.cc
+++ b/flow/scene_update_context.cc
@@ -14,7 +14,7 @@ namespace flow {
 SceneUpdateContext::SceneUpdateContext(scenic::Session* session,
                                        SurfaceProducer* surface_producer)
     : session_(session), surface_producer_(surface_producer) {
-  FXL_DCHECK(surface_producer_ != nullptr);
+  FML_DCHECK(surface_producer_ != nullptr);
 }
 
 SceneUpdateContext::~SceneUpdateContext() {
@@ -27,7 +27,7 @@ SceneUpdateContext::~SceneUpdateContext() {
 void SceneUpdateContext::AddChildScene(ExportNode* export_node,
                                        SkPoint offset,
                                        bool hit_testable) {
-  FXL_DCHECK(top_entity_);
+  FML_DCHECK(top_entity_);
 
   export_node->Bind(*this, top_entity_->entity_node(), offset, hit_testable);
 }
@@ -161,7 +161,7 @@ scenic::Image* SceneUpdateContext::GenerateImageIfNeeded(
   auto surface = surface_producer_->ProduceSurface(physical_size);
 
   if (!surface) {
-    FXL_LOG(ERROR) << "Could not acquire a surface from the surface producer "
+    FML_LOG(ERROR) << "Could not acquire a surface from the surface producer "
                       "of size: "
                    << physical_size.width() << "x" << physical_size.height();
     return nullptr;
@@ -185,7 +185,7 @@ SceneUpdateContext::ExecutePaintTasks(CompositorContext::ScopedFrame& frame) {
   TRACE_EVENT0("flutter", "SceneUpdateContext::ExecutePaintTasks");
   std::vector<std::unique_ptr<SurfaceProducerSurface>> surfaces_to_submit;
   for (auto& task : paint_tasks_) {
-    FXL_DCHECK(task.surface);
+    FML_DCHECK(task.surface);
     SkCanvas* canvas = task.surface->GetSkiaSurface()->getCanvas();
     Layer::PaintContext context = {*canvas, frame.context().frame_time(),
                                    frame.context().engine_time(),
@@ -214,7 +214,7 @@ SceneUpdateContext::Entity::Entity(SceneUpdateContext& context)
 }
 
 SceneUpdateContext::Entity::~Entity() {
-  FXL_DCHECK(context_.top_entity_ == this);
+  FML_DCHECK(context_.top_entity_ == this);
   context_.top_entity_ = previous_entity_;
 }
 
@@ -302,7 +302,7 @@ SceneUpdateContext::Frame::~Frame() {
 }
 
 void SceneUpdateContext::Frame::AddPaintedLayer(Layer* layer) {
-  FXL_DCHECK(layer->needs_painting());
+  FML_DCHECK(layer->needs_painting());
   paint_layers_.push_back(layer);
   paint_bounds_.join(layer->paint_bounds());
 }
diff --git a/flow/scene_update_context.h b/flow/scene_update_context.h
index 23beb0a887dae10cb55359146a96ab9341e82489..ac9659476ce4e8b7e0d97f4ce23b5a1b4d938553 100644
--- a/flow/scene_update_context.h
+++ b/flow/scene_update_context.h
@@ -10,9 +10,9 @@
 #include <vector>
 
 #include "flutter/flow/compositor_context.h"
-#include "lib/fxl/build_config.h"
-#include "lib/fxl/logging.h"
-#include "lib/fxl/macros.h"
+#include "flutter/fml/build_config.h"
+#include "flutter/fml/logging.h"
+#include "flutter/fml/macros.h"
 #include "lib/ui/scenic/cpp/resources.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkSurface.h"
@@ -142,7 +142,7 @@ class SceneUpdateContext {
   // CPU wait. Once Vulkan semaphores are available, this method must return
   // void and the implementation must submit surfaces on its own as soon as the
   // specific canvas operations are done.
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   std::vector<std::unique_ptr<SurfaceProducerSurface>> ExecutePaintTasks(
       CompositorContext::ScopedFrame& frame);
 
@@ -170,10 +170,10 @@ class SceneUpdateContext {
                               std::vector<Layer*> paint_layers);
   void SetShapeColor(scenic::ShapeNode& shape_node, SkColor color);
   scenic::Image* GenerateImageIfNeeded(SkColor color,
-                                           SkScalar scale_x,
-                                           SkScalar scale_y,
-                                           const SkRect& paint_bounds,
-                                           std::vector<Layer*> paint_layers);
+                                       SkScalar scale_x,
+                                       SkScalar scale_y,
+                                       const SkRect& paint_bounds,
+                                       std::vector<Layer*> paint_layers);
 
   Entity* top_entity_ = nullptr;
   float top_scale_x_ = 1.f;
@@ -189,7 +189,7 @@ class SceneUpdateContext {
   // Save ExportNodes so we can dispose them in our destructor.
   std::set<ExportNode*> export_nodes_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(SceneUpdateContext);
+  FML_DISALLOW_COPY_AND_ASSIGN(SceneUpdateContext);
 };
 
 }  // namespace flow
diff --git a/flow/skia_gpu_object.cc b/flow/skia_gpu_object.cc
index ce2312f921580e96255db5a3e713eb780b808f40..bf9d9a8ec599f1cb18dca72d06486adce8d74f4d 100644
--- a/flow/skia_gpu_object.cc
+++ b/flow/skia_gpu_object.cc
@@ -8,8 +8,8 @@
 
 namespace flow {
 
-SkiaUnrefQueue::SkiaUnrefQueue(fxl::RefPtr<fxl::TaskRunner> task_runner,
-                               fxl::TimeDelta delay)
+SkiaUnrefQueue::SkiaUnrefQueue(fml::RefPtr<fml::TaskRunner> task_runner,
+                               fml::TimeDelta delay)
     : task_runner_(std::move(task_runner)),
       drain_delay_(delay),
       drain_pending_(false) {}
@@ -24,7 +24,7 @@ void SkiaUnrefQueue::Unref(SkRefCnt* object) {
   if (!drain_pending_) {
     drain_pending_ = true;
     task_runner_->PostDelayedTask(
-        [strong = fxl::Ref(this)]() { strong->Drain(); }, drain_delay_);
+        [strong = fml::Ref(this)]() { strong->Drain(); }, drain_delay_);
   }
 }
 
diff --git a/flow/skia_gpu_object.h b/flow/skia_gpu_object.h
index 4711f80c6f4fdd51674fedb05d8fb1b06aecf348..7379b7936ec42bf579cfa3f450cf686795ccc0a1 100644
--- a/flow/skia_gpu_object.h
+++ b/flow/skia_gpu_object.h
@@ -8,16 +8,16 @@
 #include <mutex>
 #include <queue>
 
+#include "flutter/fml/memory/ref_counted.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/task_runner.h"
-#include "lib/fxl/memory/ref_ptr.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 
 namespace flow {
 
 // A queue that holds Skia objects that must be destructed on the the given task
 // runner.
-class SkiaUnrefQueue : public fxl::RefCountedThreadSafe<SkiaUnrefQueue> {
+class SkiaUnrefQueue : public fml::RefCountedThreadSafe<SkiaUnrefQueue> {
  public:
   void Unref(SkRefCnt* object);
 
@@ -29,20 +29,20 @@ class SkiaUnrefQueue : public fxl::RefCountedThreadSafe<SkiaUnrefQueue> {
   void Drain();
 
  private:
-  const fxl::RefPtr<fxl::TaskRunner> task_runner_;
-  const fxl::TimeDelta drain_delay_;
+  const fml::RefPtr<fml::TaskRunner> task_runner_;
+  const fml::TimeDelta drain_delay_;
   std::mutex mutex_;
   std::deque<SkRefCnt*> objects_;
   bool drain_pending_;
 
-  SkiaUnrefQueue(fxl::RefPtr<fxl::TaskRunner> task_runner,
-                 fxl::TimeDelta delay);
+  SkiaUnrefQueue(fml::RefPtr<fml::TaskRunner> task_runner,
+                 fml::TimeDelta delay);
 
   ~SkiaUnrefQueue();
 
-  FRIEND_REF_COUNTED_THREAD_SAFE(SkiaUnrefQueue);
-  FRIEND_MAKE_REF_COUNTED(SkiaUnrefQueue);
-  FXL_DISALLOW_COPY_AND_ASSIGN(SkiaUnrefQueue);
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(SkiaUnrefQueue);
+  FML_FRIEND_MAKE_REF_COUNTED(SkiaUnrefQueue);
+  FML_DISALLOW_COPY_AND_ASSIGN(SkiaUnrefQueue);
 };
 
 /// An object whose deallocation needs to be performed on an specific unref
@@ -55,9 +55,9 @@ class SkiaGPUObject {
 
   SkiaGPUObject() = default;
 
-  SkiaGPUObject(sk_sp<SkiaObjectType> object, fxl::RefPtr<SkiaUnrefQueue> queue)
+  SkiaGPUObject(sk_sp<SkiaObjectType> object, fml::RefPtr<SkiaUnrefQueue> queue)
       : object_(std::move(object)), queue_(std::move(queue)) {
-    FXL_DCHECK(queue_ && object_);
+    FML_DCHECK(queue_ && object_);
   }
 
   SkiaGPUObject(SkiaGPUObject&&) = default;
@@ -73,14 +73,14 @@ class SkiaGPUObject {
       queue_->Unref(object_.release());
     }
     queue_ = nullptr;
-    FXL_DCHECK(object_ == nullptr);
+    FML_DCHECK(object_ == nullptr);
   }
 
  private:
   sk_sp<SkiaObjectType> object_;
-  fxl::RefPtr<SkiaUnrefQueue> queue_;
+  fml::RefPtr<SkiaUnrefQueue> queue_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(SkiaGPUObject);
+  FML_DISALLOW_COPY_AND_ASSIGN(SkiaGPUObject);
 };
 
 }  // namespace flow
diff --git a/flow/texture.h b/flow/texture.h
index 0e8b3eaeb2cb2dd1bc12ffbd19205fc7a757e533..92e0130da35ff33bcea9e7f10488bcbb4f75b1b9 100644
--- a/flow/texture.h
+++ b/flow/texture.h
@@ -7,8 +7,8 @@
 
 #include <map>
 
+#include "flutter/fml/macros.h"
 #include "flutter/fml/synchronization/waitable_event.h"
-#include "lib/fxl/macros.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
 namespace flow {
@@ -38,7 +38,7 @@ class Texture {
  private:
   int64_t id_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(Texture);
+  FML_DISALLOW_COPY_AND_ASSIGN(Texture);
 };
 
 class TextureRegistry {
@@ -64,7 +64,7 @@ class TextureRegistry {
  private:
   std::map<int64_t, std::shared_ptr<Texture>> mapping_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(TextureRegistry);
+  FML_DISALLOW_COPY_AND_ASSIGN(TextureRegistry);
 };
 
 }  // namespace flow
diff --git a/fml/BUILD.gn b/fml/BUILD.gn
index 0551319ea25956dd979b63bc2f82d3249319028e..6d605ddf59f1ab2d902c136301934f8a1995117b 100644
--- a/fml/BUILD.gn
+++ b/fml/BUILD.gn
@@ -4,8 +4,11 @@
 
 source_set("fml") {
   sources = [
+    "arraysize.h",
     "build_config.h",
     "closure.h",
+    "command_line.cc",
+    "command_line.h",
     "compiler_specific.h",
     "eintr_wrapper.h",
     "export.h",
@@ -18,6 +21,7 @@ source_set("fml") {
     "log_settings_state.cc",
     "logging.cc",
     "logging.h",
+    "make_copyable.h",
     "mapping.cc",
     "mapping.h",
     "memory/ref_counted.h",
@@ -35,6 +39,8 @@ source_set("fml") {
     "native_library.h",
     "paths.cc",
     "paths.h",
+    "string_view.cc",
+    "string_view.h",
     "synchronization/thread_annotations.h",
     "synchronization/thread_checker.h",
     "synchronization/waitable_event.cc",
@@ -55,7 +61,6 @@ source_set("fml") {
   ]
 
   deps = [
-    "//garnet/public/lib/fxl",
     "//third_party/dart/runtime:dart_api",
 
     # These need to be in sync with the Fuchsia buildroot.
@@ -141,6 +146,7 @@ source_set("fml") {
       "platform/posix/file_posix.cc",
       "platform/posix/mapping_posix.cc",
       "platform/posix/native_library_posix.cc",
+      "platform/posix/paths_posix.cc",
     ]
   }
 }
@@ -149,9 +155,11 @@ executable("fml_unittests") {
   testonly = true
 
   sources = [
+    "command_line_unittest.cc",
     "memory/ref_counted_unittest.cc",
     "memory/weak_ptr_unittest.cc",
     "message_loop_unittests.cc",
+    "string_view_unittest.cc",
     "synchronization/thread_annotations_unittest.cc",
     "synchronization/thread_checker_unittest.cc",
     "synchronization/waitable_event_unittest.cc",
@@ -165,7 +173,6 @@ executable("fml_unittests") {
   deps = [
     "$flutter_root/fml",
     "$flutter_root/testing",
-    "//garnet/public/lib/fxl",
     "//third_party/dart/runtime:libdart_jit",
   ]
 }
diff --git a/fml/arraysize.h b/fml/arraysize.h
new file mode 100644
index 0000000000000000000000000000000000000000..8457369884a976e37e4cb6f45d45f186bd69a148
--- /dev/null
+++ b/fml/arraysize.h
@@ -0,0 +1,16 @@
+// Copyright 2016 The Fuchsia 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 FLUTTER_FML_ARRAYSIZE_H_
+#define FLUTTER_FML_ARRAYSIZE_H_
+
+#include <stddef.h>
+
+#ifndef arraysize
+template <typename T, size_t N>
+char (&ArraySizeHelper(T (&array)[N]))[N];
+#define arraysize(array) (sizeof(ArraySizeHelper(array)))
+#endif
+
+#endif  // FLUTTER_FML_ARRAYSIZE_H_
diff --git a/fml/command_line.cc b/fml/command_line.cc
new file mode 100644
index 0000000000000000000000000000000000000000..24012867edc84e4c9c2416bc20acc0e291d82071
--- /dev/null
+++ b/fml/command_line.cc
@@ -0,0 +1,165 @@
+// Copyright 2016 The Fuchsia Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/command_line.h"
+
+namespace fml {
+
+// CommandLine -----------------------------------------------------------------
+
+CommandLine::Option::Option(const std::string& name) : name(name) {}
+
+CommandLine::Option::Option(const std::string& name, const std::string& value)
+    : name(name), value(value) {}
+
+CommandLine::CommandLine() = default;
+
+CommandLine::CommandLine(const CommandLine& from) = default;
+
+CommandLine::CommandLine(CommandLine&& from) = default;
+
+CommandLine::CommandLine(const std::string& argv0,
+                         const std::vector<Option>& options,
+                         const std::vector<std::string>& positional_args)
+    : has_argv0_(true),
+      argv0_(argv0),
+      options_(options),
+      positional_args_(positional_args) {
+  for (size_t i = 0; i < options_.size(); i++)
+    option_index_[options_[i].name] = i;
+}
+
+CommandLine::~CommandLine() = default;
+
+CommandLine& CommandLine::operator=(const CommandLine& from) = default;
+
+CommandLine& CommandLine::operator=(CommandLine&& from) = default;
+
+bool CommandLine::HasOption(StringView name, size_t* index) const {
+  auto it = option_index_.find(name.ToString());
+  if (it == option_index_.end())
+    return false;
+  if (index)
+    *index = it->second;
+  return true;
+}
+
+bool CommandLine::GetOptionValue(StringView name, std::string* value) const {
+  size_t index;
+  if (!HasOption(name, &index))
+    return false;
+  *value = options_[index].value;
+  return true;
+}
+
+std::vector<fml::StringView> CommandLine::GetOptionValues(
+    StringView name) const {
+  std::vector<fml::StringView> ret;
+  for (const auto& option : options_) {
+    if (option.name == name)
+      ret.push_back(option.value);
+  }
+  return ret;
+}
+
+std::string CommandLine::GetOptionValueWithDefault(
+    StringView name,
+    StringView default_value) const {
+  size_t index;
+  if (!HasOption(name, &index))
+    return default_value.ToString();
+  return options_[index].value;
+}
+
+// Factory functions (etc.) ----------------------------------------------------
+
+namespace internal {
+
+CommandLineBuilder::CommandLineBuilder() {}
+CommandLineBuilder::~CommandLineBuilder() {}
+
+bool CommandLineBuilder::ProcessArg(const std::string& arg) {
+  if (!has_argv0_) {
+    has_argv0_ = true;
+    argv0_ = arg;
+    return false;
+  }
+
+  // If we've seen a positional argument, then the remaining arguments are also
+  // positional.
+  if (started_positional_args_) {
+    bool rv = positional_args_.empty();
+    positional_args_.push_back(arg);
+    return rv;
+  }
+
+  // Anything that doesn't start with "--" is a positional argument.
+  if (arg.size() < 2u || arg[0] != '-' || arg[1] != '-') {
+    bool rv = positional_args_.empty();
+    started_positional_args_ = true;
+    positional_args_.push_back(arg);
+    return rv;
+  }
+
+  // "--" ends option processing, but isn't stored as a positional argument.
+  if (arg.size() == 2u) {
+    started_positional_args_ = true;
+    return false;
+  }
+
+  // Note: The option name *must* be at least one character, so start at
+  // position 3 -- "--=foo" will yield a name of "=foo" and no value. (Passing a
+  // starting |pos| that's "too big" is OK.)
+  size_t equals_pos = arg.find('=', 3u);
+  if (equals_pos == std::string::npos) {
+    options_.push_back(CommandLine::Option(arg.substr(2u)));
+    return false;
+  }
+
+  options_.push_back(CommandLine::Option(arg.substr(2u, equals_pos - 2u),
+                                         arg.substr(equals_pos + 1u)));
+  return false;
+}
+
+CommandLine CommandLineBuilder::Build() const {
+  if (!has_argv0_)
+    return CommandLine();
+  return CommandLine(argv0_, options_, positional_args_);
+}
+
+}  // namespace internal
+
+std::vector<std::string> CommandLineToArgv(const CommandLine& command_line) {
+  if (!command_line.has_argv0())
+    return std::vector<std::string>();
+
+  std::vector<std::string> argv;
+  const std::vector<CommandLine::Option>& options = command_line.options();
+  const std::vector<std::string>& positional_args =
+      command_line.positional_args();
+  // Reserve space for argv[0], options, maybe a "--" (if needed), and the
+  // positional arguments.
+  argv.reserve(1u + options.size() + 1u + positional_args.size());
+
+  argv.push_back(command_line.argv0());
+  for (const auto& option : options) {
+    if (option.value.empty())
+      argv.push_back("--" + option.name);
+    else
+      argv.push_back("--" + option.name + "=" + option.value);
+  }
+
+  if (!positional_args.empty()) {
+    // Insert a "--" if necessary.
+    if (positional_args[0].size() >= 2u && positional_args[0][0] == '-' &&
+        positional_args[0][1] == '-')
+      argv.push_back("--");
+
+    argv.insert(argv.end(), positional_args.begin(), positional_args.end());
+  }
+
+  return argv;
+}
+
+}  // namespace fml
diff --git a/fml/command_line.h b/fml/command_line.h
new file mode 100644
index 0000000000000000000000000000000000000000..84b84dfe415cc5620f4b1d17c8e00743acf6cedc
--- /dev/null
+++ b/fml/command_line.h
@@ -0,0 +1,242 @@
+// Copyright 2016 The Fuchsia Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Provides a simple class, |CommandLine|, for dealing with command lines (and
+// flags and positional arguments).
+//
+// * Options (a.k.a. flags or switches) are all of the form "--name=<value>" (or
+//   "--name", but this is indistinguishable from "--name="), where <value> is a
+//   string. Not supported: "-name", "-n", "--name <value>", "-n <value>", etc.
+// * Option order is preserved.
+// * Option processing is stopped after the first positional argument[*]. Thus
+//   in the command line "my_program --foo bar --baz", only "--foo" is an option
+//   ("bar" and "--baz" are positional arguments).
+// * Options can be looked up by name. If the same option occurs multiple times,
+//   convention is to use the last occurrence (and the provided look-up
+//   functions behave this way).
+// * "--" may also be used to separate options from positional arguments. Thus
+//   in the command line "my_program --foo -- --bar", "--bar" is a positional
+//   argument.
+// * |CommandLine|s store |argv[0]| and distinguish between not having |argv[0]|
+//   and |argv[0]| being empty.
+// * Apart from being copyable and movable, |CommandLine|s are immutable.
+//
+// There are factory functions to turn raw arguments into |CommandLine|s, in
+// accordance with the above rules. However, |CommandLine|s may be used more
+// generically (with the user transforming arguments using different rules,
+// e.g., accepting "-name" as an option), subject to certain limitations (e.g.,
+// not being able to distinguish "no value" from "empty value").
+//
+// [*] This is somewhat annoying for users, but: a. it's standard Unix behavior
+// for most command line parsers, b. it makes "my_program *" (etc.) safer (which
+// mostly explains a.), c. it makes parsing "subcommands", like "my_program
+// --flag_for_my_program subcommand --flag_for_subcommand" saner.
+
+#ifndef LIB_FXL_COMMAND_LINE_H_
+#define LIB_FXL_COMMAND_LINE_H_
+
+#include <stddef.h>
+
+#include <initializer_list>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+#include "flutter/fml/macros.h"
+#include "flutter/fml/string_view.h"
+
+namespace fml {
+
+// CommandLine -----------------------------------------------------------------
+
+// Class that stores processed command lines ("argv[0]", options, and positional
+// arguments) and provides access to them. For more details, see the file-level
+// comment above. This class is thread-safe.
+class CommandLine final {
+ private:
+  class ConstructionHelper;
+
+ public:
+  struct Option {
+    Option() {}
+    explicit Option(const std::string& name);
+    Option(const std::string& name, const std::string& value);
+
+    bool operator==(const Option& other) const {
+      return name == other.name && value == other.value;
+    }
+    bool operator!=(const Option& other) const { return !operator==(other); }
+
+    std::string name;
+    std::string value;
+  };
+
+  // Default, copy, and move constructors (to be out-of-lined).
+  CommandLine();
+  CommandLine(const CommandLine& from);
+  CommandLine(CommandLine&& from);
+
+  // Constructs a |CommandLine| from its "components". This is especially useful
+  // for creating a new |CommandLine| based on an existing |CommandLine| (e.g.,
+  // adding options or arguments).
+  explicit CommandLine(const std::string& argv0,
+                       const std::vector<Option>& options,
+                       const std::vector<std::string>& positional_args);
+
+  ~CommandLine();
+
+  // Copy and move assignment (to be out-of-lined).
+  CommandLine& operator=(const CommandLine& from);
+  CommandLine& operator=(CommandLine&& from);
+
+  bool has_argv0() const { return has_argv0_; }
+  const std::string& argv0() const { return argv0_; }
+  const std::vector<Option>& options() const { return options_; }
+  const std::vector<std::string>& positional_args() const {
+    return positional_args_;
+  }
+
+  bool operator==(const CommandLine& other) const {
+    // No need to compare |option_index_|.
+    return has_argv0_ == other.has_argv0_ && argv0_ == other.argv0_ &&
+           options_ == other.options_ &&
+           positional_args_ == other.positional_args_;
+  }
+  bool operator!=(const CommandLine& other) const { return !operator==(other); }
+
+  // Returns true if this command line has the option |name| (and if |index| is
+  // non-null, sets |*index| to the index of the *last* occurrence of the given
+  // option in |options()|) and false if not.
+  bool HasOption(StringView name, size_t* index = nullptr) const;
+
+  // Gets the value of the option |name|. Returns true (and sets |*value|) on
+  // success and false (leaving |*value| alone) on failure.
+  bool GetOptionValue(StringView name, std::string* value) const;
+
+  // Gets all values of the option |name|. Returns all values, which may be
+  // empty if the option is not specified.
+  std::vector<StringView> GetOptionValues(StringView name) const;
+
+  // Gets the value of the option |name|, with a default if the option is not
+  // specified. (Note: This doesn't return a const reference, since this would
+  // make the |default_value| argument inconvenient/dangerous.)
+  std::string GetOptionValueWithDefault(StringView name,
+                                        StringView default_value) const;
+
+ private:
+  bool has_argv0_ = false;
+  // The following should all be empty if |has_argv0_| is false.
+  std::string argv0_;
+  std::vector<Option> options_;
+  std::vector<std::string> positional_args_;
+
+  // Maps option names to position in |options_|. If a given name occurs
+  // multiple times, the index will be to the *last* occurrence.
+  std::unordered_map<std::string, size_t> option_index_;
+
+  // Allow copy and assignment.
+};
+
+// Factory functions (etc.) ----------------------------------------------------
+
+namespace internal {
+
+// Helper class for building command lines (finding options, etc.) from raw
+// arguments.
+class CommandLineBuilder final {
+ public:
+  CommandLineBuilder();
+  ~CommandLineBuilder();
+
+  // Processes an additional argument in the command line. Returns true if |arg|
+  // is the *first* positional argument.
+  bool ProcessArg(const std::string& arg);
+
+  // Builds a |CommandLine| from the arguments processed so far.
+  CommandLine Build() const;
+
+ private:
+  bool has_argv0_ = false;
+  std::string argv0_;
+  std::vector<CommandLine::Option> options_;
+  std::vector<std::string> positional_args_;
+
+  // True if we've started processing positional arguments.
+  bool started_positional_args_ = false;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(CommandLineBuilder);
+};
+
+}  // namespace internal
+
+// The following factory functions create |CommandLine|s from raw arguments in
+// accordance with the rules outlined at the top of this file. (Other ways of
+// transforming raw arguments into options and positional arguments are
+// possible.)
+
+// Like |CommandLineFromIterators()| (see below), but sets
+// |*first_positional_arg| to point to the first positional argument seen (or
+// |last| if none are seen). This is useful for processing "subcommands".
+template <typename InputIterator>
+inline CommandLine CommandLineFromIteratorsFindFirstPositionalArg(
+    InputIterator first,
+    InputIterator last,
+    InputIterator* first_positional_arg) {
+  if (first_positional_arg)
+    *first_positional_arg = last;
+  internal::CommandLineBuilder builder;
+  for (auto it = first; it < last; ++it) {
+    if (builder.ProcessArg(*it)) {
+      if (first_positional_arg)
+        *first_positional_arg = it;
+    }
+  }
+  return builder.Build();
+}
+
+// Builds a |CommandLine| from first/last iterators (where |last| is really
+// one-past-the-last, as usual) to |std::string|s or things that implicitly
+// convert to |std::string|.
+template <typename InputIterator>
+inline CommandLine CommandLineFromIterators(InputIterator first,
+                                            InputIterator last) {
+  return CommandLineFromIteratorsFindFirstPositionalArg<InputIterator>(
+      first, last, nullptr);
+}
+
+// Builds a |CommandLine| from first/last iterators (where |last| is really
+// one-past-the-last, as usual) to |std::string|s or things that implicitly
+// convert to |std::string|, where argv[0] is provided separately.
+template <typename InputIterator>
+inline CommandLine CommandLineFromIteratorsWithArgv0(const std::string& argv0,
+                                                     InputIterator first,
+                                                     InputIterator last) {
+  internal::CommandLineBuilder builder;
+  builder.ProcessArg(argv0);
+  for (auto it = first; it < last; ++it)
+    builder.ProcessArg(*it);
+  return builder.Build();
+}
+
+// Builds a |CommandLine| from the usual argc/argv.
+inline CommandLine CommandLineFromArgcArgv(int argc, const char* const* argv) {
+  return CommandLineFromIterators(argv, argv + argc);
+}
+
+// Builds a |CommandLine| from an initializer list of |std::string|s or things
+// that implicitly convert to |std::string|.
+template <typename StringType>
+inline CommandLine CommandLineFromInitializerList(
+    std::initializer_list<StringType> argv) {
+  return CommandLineFromIterators(argv.begin(), argv.end());
+}
+
+// This is the "opposite" of the above factory functions, transforming a
+// |CommandLine| into a vector of argument strings according to the rules
+// outlined at the top of this file.
+std::vector<std::string> CommandLineToArgv(const CommandLine& command_line);
+
+}  // namespace fml
+
+#endif  // LIB_FXL_COMMAND_LINE_H_
diff --git a/fml/command_line_unittest.cc b/fml/command_line_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..0cafaa52c899c80a8725bc3b6537471e4ad7a68f
--- /dev/null
+++ b/fml/command_line_unittest.cc
@@ -0,0 +1,447 @@
+// Copyright 2016 The Fuchsia Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/command_line.h"
+
+#include <utility>
+
+#include "flutter/fml/arraysize.h"
+#include "flutter/fml/macros.h"
+#include "gtest/gtest.h"
+
+namespace fml {
+namespace {
+
+TEST(CommandLineTest, Basic) {
+  // Making this const verifies that the methods called are const.
+  const auto cl = CommandLineFromInitializerList(
+      {"my_program", "--flag1", "--flag2=value2", "arg1", "arg2", "arg3"});
+
+  EXPECT_TRUE(cl.has_argv0());
+  EXPECT_EQ("my_program", cl.argv0());
+
+  EXPECT_EQ(2u, cl.options().size());
+  EXPECT_EQ("flag1", cl.options()[0].name);
+  EXPECT_EQ(std::string(), cl.options()[0].value);
+  EXPECT_EQ("flag2", cl.options()[1].name);
+  EXPECT_EQ("value2", cl.options()[1].value);
+
+  EXPECT_EQ(3u, cl.positional_args().size());
+  EXPECT_EQ("arg1", cl.positional_args()[0]);
+  EXPECT_EQ("arg2", cl.positional_args()[1]);
+  EXPECT_EQ("arg3", cl.positional_args()[2]);
+
+  EXPECT_TRUE(cl.HasOption("flag1"));
+  EXPECT_TRUE(cl.HasOption("flag1", nullptr));
+  size_t index = static_cast<size_t>(-1);
+  EXPECT_TRUE(cl.HasOption("flag2", &index));
+  EXPECT_EQ(1u, index);
+  EXPECT_FALSE(cl.HasOption("flag3"));
+  EXPECT_FALSE(cl.HasOption("flag3", nullptr));
+
+  std::string value = "nonempty";
+  EXPECT_TRUE(cl.GetOptionValue("flag1", &value));
+  EXPECT_EQ(std::string(), value);
+  EXPECT_TRUE(cl.GetOptionValue("flag2", &value));
+  EXPECT_EQ("value2", value);
+  EXPECT_FALSE(cl.GetOptionValue("flag3", &value));
+
+  EXPECT_EQ(std::string(), cl.GetOptionValueWithDefault("flag1", "nope"));
+  EXPECT_EQ("value2", cl.GetOptionValueWithDefault("flag2", "nope"));
+  EXPECT_EQ("nope", cl.GetOptionValueWithDefault("flag3", "nope"));
+}
+
+TEST(CommandLineTest, DefaultConstructor) {
+  CommandLine cl;
+  EXPECT_FALSE(cl.has_argv0());
+  EXPECT_EQ(std::string(), cl.argv0());
+  EXPECT_EQ(std::vector<CommandLine::Option>(), cl.options());
+  EXPECT_EQ(std::vector<std::string>(), cl.positional_args());
+}
+
+TEST(CommandLineTest, ComponentConstructor) {
+  const std::string argv0 = "my_program";
+  const std::vector<CommandLine::Option> options = {
+      CommandLine::Option("flag", "value")};
+  const std::vector<std::string> positional_args = {"arg"};
+
+  CommandLine cl(argv0, options, positional_args);
+  EXPECT_TRUE(cl.has_argv0());
+  EXPECT_EQ(argv0, cl.argv0());
+  EXPECT_EQ(options, cl.options());
+  EXPECT_EQ(positional_args, cl.positional_args());
+  EXPECT_EQ("value", cl.GetOptionValueWithDefault("flag", "nope"));
+}
+
+TEST(CommandLineTest, CommandLineFromIteratorsFindFirstPositionalArg) {
+  // This shows how one might process subcommands.
+  {
+    static std::vector<std::string> argv = {"my_program", "--flag1",
+                                            "--flag2",    "subcommand",
+                                            "--subflag",  "subarg"};
+    auto first = argv.cbegin();
+    auto last = argv.cend();
+    std::vector<std::string>::const_iterator sub_first;
+    auto cl =
+        CommandLineFromIteratorsFindFirstPositionalArg(first, last, &sub_first);
+    EXPECT_TRUE(cl.has_argv0());
+    EXPECT_EQ(argv[0], cl.argv0());
+    std::vector<CommandLine::Option> expected_options = {
+        CommandLine::Option("flag1"), CommandLine::Option("flag2")};
+    EXPECT_EQ(expected_options, cl.options());
+    std::vector<std::string> expected_positional_args = {argv[3], argv[4],
+                                                         argv[5]};
+    EXPECT_EQ(expected_positional_args, cl.positional_args());
+    EXPECT_TRUE(cl.HasOption("flag1", nullptr));
+    EXPECT_TRUE(cl.HasOption("flag2", nullptr));
+    EXPECT_FALSE(cl.HasOption("subflag", nullptr));
+
+    EXPECT_EQ(first + 3, sub_first);
+    auto sub_cl = CommandLineFromIterators(sub_first, last);
+    EXPECT_TRUE(sub_cl.has_argv0());
+    EXPECT_EQ(argv[3], sub_cl.argv0());
+    std::vector<CommandLine::Option> expected_sub_options = {
+        CommandLine::Option("subflag")};
+    EXPECT_EQ(expected_sub_options, sub_cl.options());
+    std::vector<std::string> expected_sub_positional_args = {argv[5]};
+    EXPECT_EQ(expected_sub_positional_args, sub_cl.positional_args());
+    EXPECT_FALSE(sub_cl.HasOption("flag1", nullptr));
+    EXPECT_FALSE(sub_cl.HasOption("flag2", nullptr));
+    EXPECT_TRUE(sub_cl.HasOption("subflag", nullptr));
+  }
+
+  // No positional argument.
+  {
+    static std::vector<std::string> argv = {"my_program", "--flag"};
+    std::vector<std::string>::const_iterator sub_first;
+    auto cl = CommandLineFromIteratorsFindFirstPositionalArg(
+        argv.cbegin(), argv.cend(), &sub_first);
+    EXPECT_EQ(argv.cend(), sub_first);
+  }
+
+  // Multiple positional arguments.
+  {
+    static std::vector<std::string> argv = {"my_program", "arg1", "arg2"};
+    std::vector<std::string>::const_iterator sub_first;
+    auto cl = CommandLineFromIteratorsFindFirstPositionalArg(
+        argv.cbegin(), argv.cend(), &sub_first);
+    EXPECT_EQ(argv.cbegin() + 1, sub_first);
+  }
+
+  // "--".
+  {
+    static std::vector<std::string> argv = {"my_program", "--", "--arg"};
+    std::vector<std::string>::const_iterator sub_first;
+    auto cl = CommandLineFromIteratorsFindFirstPositionalArg(
+        argv.cbegin(), argv.cend(), &sub_first);
+    EXPECT_EQ(argv.cbegin() + 2, sub_first);
+  }
+}
+
+TEST(CommandLineTest, CommmandLineFromIterators) {
+  {
+    // Note (here and below): The |const| ensures that the factory method can
+    // accept const iterators.
+    const std::vector<std::string> argv = {"my_program", "--flag=value", "arg"};
+
+    auto cl = CommandLineFromIterators(argv.begin(), argv.end());
+    EXPECT_TRUE(cl.has_argv0());
+    EXPECT_EQ(argv[0], cl.argv0());
+    std::vector<CommandLine::Option> expected_options = {
+        CommandLine::Option("flag", "value")};
+    EXPECT_EQ(expected_options, cl.options());
+    std::vector<std::string> expected_positional_args = {argv[2]};
+    EXPECT_EQ(expected_positional_args, cl.positional_args());
+    EXPECT_EQ("value", cl.GetOptionValueWithDefault("flag", "nope"));
+  }
+
+  // Can handle empty argv.
+  {
+    const std::vector<std::string> argv;
+
+    auto cl = CommandLineFromIterators(argv.begin(), argv.end());
+    EXPECT_FALSE(cl.has_argv0());
+    EXPECT_EQ(std::string(), cl.argv0());
+    EXPECT_EQ(std::vector<CommandLine::Option>(), cl.options());
+    EXPECT_EQ(std::vector<std::string>(), cl.positional_args());
+  }
+
+  // Can handle empty |argv[0]|.
+  {
+    const std::vector<std::string> argv = {""};
+
+    auto cl = CommandLineFromIterators(argv.begin(), argv.end());
+    EXPECT_TRUE(cl.has_argv0());
+    EXPECT_EQ(std::string(), cl.argv0());
+    EXPECT_EQ(std::vector<CommandLine::Option>(), cl.options());
+    EXPECT_EQ(std::vector<std::string>(), cl.positional_args());
+  }
+
+  // Can also take a vector of |const char*|s.
+  {
+    const std::vector<const char*> argv = {"my_program", "--flag=value", "arg"};
+
+    auto cl = CommandLineFromIterators(argv.begin(), argv.end());
+    EXPECT_TRUE(cl.has_argv0());
+    EXPECT_EQ(argv[0], cl.argv0());
+    std::vector<CommandLine::Option> expected_options = {
+        CommandLine::Option("flag", "value")};
+    EXPECT_EQ(expected_options, cl.options());
+    std::vector<std::string> expected_positional_args = {argv[2]};
+    EXPECT_EQ(expected_positional_args, cl.positional_args());
+    EXPECT_EQ("value", cl.GetOptionValueWithDefault("flag", "nope"));
+  }
+
+  // Or a plain old array.
+  {
+    static const char* const argv[] = {"my_program", "--flag=value", "arg"};
+
+    auto cl = CommandLineFromIterators(argv, argv + arraysize(argv));
+    EXPECT_TRUE(cl.has_argv0());
+    EXPECT_EQ(argv[0], cl.argv0());
+    std::vector<CommandLine::Option> expected_options = {
+        CommandLine::Option("flag", "value")};
+    EXPECT_EQ(expected_options, cl.options());
+    std::vector<std::string> expected_positional_args = {argv[2]};
+    EXPECT_EQ(expected_positional_args, cl.positional_args());
+    EXPECT_EQ("value", cl.GetOptionValueWithDefault("flag", "nope"));
+  }
+}
+
+TEST(CommandLineTest, CommandLineFromArgcArgv) {
+  static const char* const argv[] = {"my_program", "--flag=value", "arg"};
+  const int argc = static_cast<int>(arraysize(argv));
+
+  auto cl = CommandLineFromArgcArgv(argc, argv);
+  EXPECT_TRUE(cl.has_argv0());
+  EXPECT_EQ(argv[0], cl.argv0());
+  std::vector<CommandLine::Option> expected_options = {
+      CommandLine::Option("flag", "value")};
+  EXPECT_EQ(expected_options, cl.options());
+  std::vector<std::string> expected_positional_args = {argv[2]};
+  EXPECT_EQ(expected_positional_args, cl.positional_args());
+  EXPECT_EQ("value", cl.GetOptionValueWithDefault("flag", "nope"));
+}
+
+TEST(CommandLineTest, CommandLineFromInitializerList) {
+  {
+    std::initializer_list<const char*> il = {"my_program", "--flag=value",
+                                             "arg"};
+    auto cl = CommandLineFromInitializerList(il);
+    EXPECT_TRUE(cl.has_argv0());
+    EXPECT_EQ("my_program", cl.argv0());
+    std::vector<CommandLine::Option> expected_options = {
+        CommandLine::Option("flag", "value")};
+    EXPECT_EQ(expected_options, cl.options());
+    std::vector<std::string> expected_positional_args = {"arg"};
+    EXPECT_EQ(expected_positional_args, cl.positional_args());
+    EXPECT_EQ("value", cl.GetOptionValueWithDefault("flag", "nope"));
+  }
+
+  {
+    std::initializer_list<std::string> il = {"my_program", "--flag=value",
+                                             "arg"};
+    auto cl = CommandLineFromInitializerList(il);
+    EXPECT_TRUE(cl.has_argv0());
+    EXPECT_EQ("my_program", cl.argv0());
+    std::vector<CommandLine::Option> expected_options = {
+        CommandLine::Option("flag", "value")};
+    EXPECT_EQ(expected_options, cl.options());
+    std::vector<std::string> expected_positional_args = {"arg"};
+    EXPECT_EQ(expected_positional_args, cl.positional_args());
+    EXPECT_EQ("value", cl.GetOptionValueWithDefault("flag", "nope"));
+  }
+}
+
+TEST(CommandLineTest, OddArguments) {
+  {
+    // Except for "arg", these are all options.
+    auto cl = CommandLineFromInitializerList(
+        {"my_program", "--=", "--=foo", "--bar=", "--==", "--===", "--==x",
+         "arg"});
+    EXPECT_TRUE(cl.has_argv0());
+    EXPECT_EQ("my_program", cl.argv0());
+    std::vector<CommandLine::Option> expected_options = {
+        CommandLine::Option("="),      CommandLine::Option("=foo"),
+        CommandLine::Option("bar"),    CommandLine::Option("="),
+        CommandLine::Option("=", "="), CommandLine::Option("=", "x")};
+    EXPECT_EQ(expected_options, cl.options());
+    std::vector<std::string> expected_positional_args = {"arg"};
+    EXPECT_EQ(expected_positional_args, cl.positional_args());
+  }
+
+  // "-x" is an argument, not an options.
+  {
+    auto cl = CommandLineFromInitializerList({"", "-x"});
+    EXPECT_TRUE(cl.has_argv0());
+    EXPECT_EQ(std::string(), cl.argv0());
+    EXPECT_EQ(std::vector<CommandLine::Option>(), cl.options());
+    std::vector<std::string> expected_positional_args = {"-x"};
+    EXPECT_EQ(expected_positional_args, cl.positional_args());
+  }
+
+  // Ditto for "-".
+  {
+    auto cl = CommandLineFromInitializerList({"", "-"});
+    EXPECT_TRUE(cl.has_argv0());
+    EXPECT_EQ(std::string(), cl.argv0());
+    EXPECT_EQ(std::vector<CommandLine::Option>(), cl.options());
+    std::vector<std::string> expected_positional_args = {"-"};
+    EXPECT_EQ(expected_positional_args, cl.positional_args());
+  }
+
+  // "--" terminates option processing, but isn't an argument in the first
+  // occurrence.
+  {
+    auto cl = CommandLineFromInitializerList(
+        {"", "--flag=value", "--", "--not-a-flag", "arg", "--"});
+    EXPECT_TRUE(cl.has_argv0());
+    EXPECT_EQ(std::string(), cl.argv0());
+    std::vector<CommandLine::Option> expected_options = {
+        CommandLine::Option("flag", "value")};
+    std::vector<std::string> expected_positional_args = {"--not-a-flag", "arg",
+                                                         "--"};
+    EXPECT_EQ(expected_positional_args, cl.positional_args());
+  }
+}
+
+TEST(CommandLineTest, MultipleOccurrencesOfOption) {
+  auto cl = CommandLineFromInitializerList(
+      {"my_program", "--flag1=value1", "--flag2=value2", "--flag1=value3"});
+  std::vector<CommandLine::Option> expected_options = {
+      CommandLine::Option("flag1", "value1"),
+      CommandLine::Option("flag2", "value2"),
+      CommandLine::Option("flag1", "value3")};
+  EXPECT_EQ("value3", cl.GetOptionValueWithDefault("flag1", "nope"));
+  EXPECT_EQ("value2", cl.GetOptionValueWithDefault("flag2", "nope"));
+  std::vector<StringView> values = cl.GetOptionValues("flag1");
+  ASSERT_EQ(2u, values.size());
+  EXPECT_EQ("value1", values[0]);
+  EXPECT_EQ("value3", values[1]);
+}
+
+// |cl1| and |cl2| should be not equal.
+void ExpectNotEqual(const char* message,
+                    std::initializer_list<std::string> c1,
+                    std::initializer_list<std::string> c2) {
+  SCOPED_TRACE(message);
+
+  const auto cl1 = CommandLineFromInitializerList(c1);
+  const auto cl2 = CommandLineFromInitializerList(c2);
+
+  // These are tautological.
+  EXPECT_TRUE(cl1 == cl1);
+  EXPECT_FALSE(cl1 != cl1);
+  EXPECT_TRUE(cl2 == cl2);
+  EXPECT_FALSE(cl2 != cl2);
+
+  // These rely on |cl1| not being equal to |cl2|.
+  EXPECT_FALSE(cl1 == cl2);
+  EXPECT_TRUE(cl1 != cl2);
+  EXPECT_FALSE(cl2 == cl1);
+  EXPECT_TRUE(cl2 != cl1);
+}
+
+void ExpectEqual(const char* message,
+                 std::initializer_list<std::string> c1,
+                 std::initializer_list<std::string> c2) {
+  SCOPED_TRACE(message);
+
+  const auto cl1 = CommandLineFromInitializerList(c1);
+  const auto cl2 = CommandLineFromInitializerList(c2);
+
+  // These are tautological.
+  EXPECT_TRUE(cl1 == cl1);
+  EXPECT_FALSE(cl1 != cl1);
+  EXPECT_TRUE(cl2 == cl2);
+  EXPECT_FALSE(cl2 != cl2);
+
+  // These rely on |cl1| being equal to |cl2|.
+  EXPECT_TRUE(cl1 == cl2);
+  EXPECT_FALSE(cl1 != cl2);
+  EXPECT_TRUE(cl2 == cl1);
+  EXPECT_FALSE(cl2 != cl1);
+}
+
+TEST(CommandLineTest, ComparisonOperators) {
+  ExpectNotEqual("1", {}, {""});
+  ExpectNotEqual("2", {"abc"}, {"def"});
+  ExpectNotEqual("3", {"abc", "--flag"}, {"abc"});
+  ExpectNotEqual("4", {"abc", "--flag1"}, {"abc", "--flag2"});
+  ExpectNotEqual("5", {"abc", "--flag1", "--flag2"}, {"abc", "--flag1"});
+  ExpectNotEqual("6", {"abc", "arg"}, {"abc"});
+  ExpectNotEqual("7", {"abc", "arg1"}, {"abc", "arg2"});
+  ExpectNotEqual("8", {"abc", "arg1", "arg2"}, {"abc", "arg1"});
+  ExpectNotEqual("9", {"abc", "--flag", "arg1"}, {"abc", "--flag", "arg2"});
+
+  // However, the presence of an unnecessary "--" shouldn't affect what's
+  // constructed.
+  ExpectEqual("10", {"abc", "--flag", "arg"}, {"abc", "--flag", "--", "arg"});
+}
+
+TEST(CommandLineTest, MoveAndCopy) {
+  const auto cl = CommandLineFromInitializerList(
+      {"my_program", "--flag1=value1", "--flag2", "arg"});
+
+  // Copy constructor.
+  CommandLine cl2(cl);
+  EXPECT_EQ(cl, cl2);
+  // Check that |option_index_| gets copied too.
+  EXPECT_EQ("value1", cl2.GetOptionValueWithDefault("flag1", "nope"));
+
+  // Move constructor.
+  CommandLine cl3(std::move(cl2));
+  EXPECT_EQ(cl, cl3);
+  EXPECT_EQ("value1", cl3.GetOptionValueWithDefault("flag1", "nope"));
+
+  // Copy assignment.
+  CommandLine cl4;
+  EXPECT_NE(cl, cl4);
+  cl4 = cl;
+  EXPECT_EQ(cl, cl4);
+  EXPECT_EQ("value1", cl4.GetOptionValueWithDefault("flag1", "nope"));
+
+  // Move assignment.
+  CommandLine cl5;
+  EXPECT_NE(cl, cl5);
+  cl5 = std::move(cl4);
+  EXPECT_EQ(cl, cl5);
+  EXPECT_EQ("value1", cl5.GetOptionValueWithDefault("flag1", "nope"));
+}
+
+void ToArgvHelper(const char* message, std::initializer_list<std::string> c) {
+  SCOPED_TRACE(message);
+  std::vector<std::string> argv = c;
+  auto cl = CommandLineFromInitializerList(c);
+  EXPECT_EQ(argv, CommandLineToArgv(cl));
+}
+
+TEST(CommandLineTest, CommandLineToArgv) {
+  ToArgvHelper("1", {});
+  ToArgvHelper("2", {""});
+  ToArgvHelper("3", {"my_program"});
+  ToArgvHelper("4", {"my_program", "--flag"});
+  ToArgvHelper("5", {"my_program", "--flag1", "--flag2=value"});
+  ToArgvHelper("6", {"my_program", "arg"});
+  ToArgvHelper("7", {"my_program", "arg1", "arg2"});
+  ToArgvHelper("8", {"my_program", "--flag1", "--flag2=value", "arg1", "arg2"});
+  ToArgvHelper("9", {"my_program", "--flag", "--", "--not-a-flag"});
+  ToArgvHelper("10", {"my_program", "--flag", "arg", "--"});
+
+  // However, |CommandLineToArgv()| will "strip" an unneeded "--".
+  {
+    auto cl = CommandLineFromInitializerList({"my_program", "--"});
+    std::vector<std::string> argv = {"my_program"};
+    EXPECT_EQ(argv, CommandLineToArgv(cl));
+  }
+  {
+    auto cl =
+        CommandLineFromInitializerList({"my_program", "--flag", "--", "arg"});
+    std::vector<std::string> argv = {"my_program", "--flag", "arg"};
+    EXPECT_EQ(argv, CommandLineToArgv(cl));
+  }
+}
+
+}  // namespace
+}  // namespace fml
diff --git a/fml/file.h b/fml/file.h
index 53da3b8ca759ee1514b000e5c031bfcabcab579b..d915a2f3e349810eb869597286f88f65a7d1154f 100644
--- a/fml/file.h
+++ b/fml/file.h
@@ -30,6 +30,9 @@ fml::UniqueFD Duplicate(fml::UniqueFD::element_type descriptor);
 
 bool IsDirectory(const fml::UniqueFD& directory);
 
+// Returns whether the given path is a file.
+bool IsFile(const std::string& path);
+
 }  // namespace fml
 
 #endif  // FLUTTER_FML_FILE_H_
diff --git a/fml/make_copyable.h b/fml/make_copyable.h
new file mode 100644
index 0000000000000000000000000000000000000000..bb5d043af3607f12b42974ab6ab50bd0e465964c
--- /dev/null
+++ b/fml/make_copyable.h
@@ -0,0 +1,63 @@
+// Copyright 2016 The Fuchsia 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 FLUTTER_FML_MAKE_COPYABLE_H_
+#define FLUTTER_FML_MAKE_COPYABLE_H_
+
+#include <utility>
+
+#include "flutter/fml/memory/ref_counted.h"
+#include "flutter/fml/memory/ref_ptr.h"
+
+namespace fml {
+namespace internal {
+
+template <typename T>
+class CopyableLambda {
+ public:
+  explicit CopyableLambda(T func)
+      : impl_(MakeRefCounted<Impl>(std::move(func))) {}
+
+  template <typename... ArgType>
+  auto operator()(ArgType&&... args) const {
+    return impl_->func_(std::forward<ArgType>(args)...);
+  }
+
+ private:
+  class Impl : public RefCountedThreadSafe<Impl> {
+   public:
+    explicit Impl(T func) : func_(std::move(func)) {}
+    T func_;
+  };
+
+  RefPtr<Impl> impl_;
+};
+
+}  // namespace internal
+
+// Provides a wrapper for a move-only lambda that is implictly convertable to an
+// std::function.
+//
+// std::function is copyable, but if a lambda captures an argument with a
+// move-only type, the lambda itself is not copyable. In order to use the lambda
+// in places that accept std::functions, we provide a copyable object that wraps
+// the lambda and is implicitly convertable to an std::function.
+//
+// EXAMPLE:
+//
+// std::unique_ptr<Foo> foo = ...
+// std::function<int()> func =
+//     fml::MakeCopyable([bar = std::move(foo)]() { return bar->count(); });
+//
+// Notice that the return type of MakeCopyable is rarely used directly. Instead,
+// callers typically erase the type by implicitly converting the return value
+// to an std::function.
+template <typename T>
+internal::CopyableLambda<T> MakeCopyable(T lambda) {
+  return internal::CopyableLambda<T>(std::move(lambda));
+}
+
+}  // namespace fml
+
+#endif  // FLUTTER_FML_MAKE_COPYABLE_H_
diff --git a/fml/memory/ref_counted.h b/fml/memory/ref_counted.h
index 4dc6fc5ee1456c55f51c7d9a914ea4a715b02d09..269b8eff4551fbfdd34d7b079e681bceb505e17c 100644
--- a/fml/memory/ref_counted.h
+++ b/fml/memory/ref_counted.h
@@ -21,8 +21,8 @@ namespace fml {
 //
 // |~Foo()| *may* be made private (e.g., to avoid accidental deletion of objects
 // while there are still references to them), |Foo| should friend
-// |RefCountedThreadSafe<Foo>|; use |FML_FRIEND_REF_COUNTED_THREAD_SAFE()| for
-// this:
+// |RefCountedThreadSafe<Foo>|; use |FML_FRIEND_REF_COUNTED_THREAD_SAFE()|
+// for this:
 //
 //   class Foo : public RefCountedThreadSafe<Foo> {
 //     ...
diff --git a/fml/memory/thread_checker.h b/fml/memory/thread_checker.h
index 2180683309d6c07677864818f908eaa3cb0fd023..8101dd4f8403b7fbffdfa016e3a0acb120eee224 100644
--- a/fml/memory/thread_checker.h
+++ b/fml/memory/thread_checker.h
@@ -55,7 +55,9 @@ class ThreadChecker final {
 #endif
 };
 
-#ifndef NDEBUG
+// TODO(chinmaygarde): Re-enable this after auditing all new users of
+// fml::WeakPtr.
+#if !defined(NDEBUG) && false
 #define FML_DECLARE_THREAD_CHECKER(c) fml::ThreadChecker c
 #define FML_DCHECK_CREATION_THREAD_IS_CURRENT(c) \
   FML_DCHECK((c).IsCreationThreadCurrent())
diff --git a/fml/message_loop.cc b/fml/message_loop.cc
index 1b98148e66982b4f663769288fdf8c2057f0cb8d..9c2275e219a0064bcb5c87683445b266da384297 100644
--- a/fml/message_loop.cc
+++ b/fml/message_loop.cc
@@ -6,11 +6,11 @@
 
 #include <utility>
 
+#include "flutter/fml/memory/ref_counted.h"
+#include "flutter/fml/memory/ref_ptr.h"
 #include "flutter/fml/message_loop_impl.h"
 #include "flutter/fml/task_runner.h"
 #include "flutter/fml/thread_local.h"
-#include "lib/fxl/memory/ref_counted.h"
-#include "lib/fxl/memory/ref_ptr.h"
 
 namespace fml {
 
@@ -40,7 +40,7 @@ bool MessageLoop::IsInitializedForCurrentThread() {
 
 MessageLoop::MessageLoop()
     : loop_(MessageLoopImpl::Create()),
-      task_runner_(fxl::MakeRefCounted<fml::TaskRunner>(loop_)) {
+      task_runner_(fml::MakeRefCounted<fml::TaskRunner>(loop_)) {
   FML_CHECK(loop_);
   FML_CHECK(task_runner_);
 }
@@ -55,15 +55,15 @@ void MessageLoop::Terminate() {
   loop_->DoTerminate();
 }
 
-fxl::RefPtr<fml::TaskRunner> MessageLoop::GetTaskRunner() const {
+fml::RefPtr<fml::TaskRunner> MessageLoop::GetTaskRunner() const {
   return task_runner_;
 }
 
-fxl::RefPtr<MessageLoopImpl> MessageLoop::GetLoopImpl() const {
+fml::RefPtr<MessageLoopImpl> MessageLoop::GetLoopImpl() const {
   return loop_;
 }
 
-void MessageLoop::AddTaskObserver(intptr_t key, fxl::Closure callback) {
+void MessageLoop::AddTaskObserver(intptr_t key, fml::closure callback) {
   loop_->AddTaskObserver(key, callback);
 }
 
diff --git a/fml/message_loop.h b/fml/message_loop.h
index 9b2a28ccc471514fa16ebd6ebc442a0c857a5f16..8deaca2aab1a362ee94cd19d921fafe94b99b617 100644
--- a/fml/message_loop.h
+++ b/fml/message_loop.h
@@ -6,7 +6,7 @@
 #define FLUTTER_FML_MESSAGE_LOOP_H_
 
 #include "flutter/fml/macros.h"
-#include "lib/fxl/tasks/task_runner.h"
+#include "flutter/fml/task_runner.h"
 
 namespace fml {
 
@@ -24,11 +24,11 @@ class MessageLoop {
 
   void Terminate();
 
-  void AddTaskObserver(intptr_t key, fxl::Closure callback);
+  void AddTaskObserver(intptr_t key, fml::closure callback);
 
   void RemoveTaskObserver(intptr_t key);
 
-  fxl::RefPtr<fml::TaskRunner> GetTaskRunner() const;
+  fml::RefPtr<fml::TaskRunner> GetTaskRunner() const;
 
   // Exposed for the embedder shell which allows clients to poll for events
   // instead of dedicating a thread to the message loop.
@@ -44,12 +44,12 @@ class MessageLoop {
   friend class TaskRunner;
   friend class MessageLoopImpl;
 
-  fxl::RefPtr<MessageLoopImpl> loop_;
-  fxl::RefPtr<fml::TaskRunner> task_runner_;
+  fml::RefPtr<MessageLoopImpl> loop_;
+  fml::RefPtr<fml::TaskRunner> task_runner_;
 
   MessageLoop();
 
-  fxl::RefPtr<MessageLoopImpl> GetLoopImpl() const;
+  fml::RefPtr<MessageLoopImpl> GetLoopImpl() const;
 
   FML_DISALLOW_COPY_AND_ASSIGN(MessageLoop);
 };
diff --git a/fml/message_loop_impl.cc b/fml/message_loop_impl.cc
index c960b7cdb742fb5a726443d04213872bb5b3470d..8a1d17ba766142faaf03bfe5d6848feb9fd1ae58 100644
--- a/fml/message_loop_impl.cc
+++ b/fml/message_loop_impl.cc
@@ -25,15 +25,15 @@
 
 namespace fml {
 
-fxl::RefPtr<MessageLoopImpl> MessageLoopImpl::Create() {
+fml::RefPtr<MessageLoopImpl> MessageLoopImpl::Create() {
 #if OS_MACOSX
-  return fxl::MakeRefCounted<MessageLoopDarwin>();
+  return fml::MakeRefCounted<MessageLoopDarwin>();
 #elif OS_ANDROID
-  return fxl::MakeRefCounted<MessageLoopAndroid>();
+  return fml::MakeRefCounted<MessageLoopAndroid>();
 #elif OS_LINUX
-  return fxl::MakeRefCounted<MessageLoopLinux>();
+  return fml::MakeRefCounted<MessageLoopLinux>();
 #elif OS_WIN
-  return fxl::MakeRefCounted<MessageLoopWin>();
+  return fml::MakeRefCounted<MessageLoopWin>();
 #else
   return nullptr;
 #endif
@@ -43,7 +43,7 @@ MessageLoopImpl::MessageLoopImpl() : order_(0), terminated_(false) {}
 
 MessageLoopImpl::~MessageLoopImpl() = default;
 
-void MessageLoopImpl::PostTask(fxl::Closure task, fxl::TimePoint target_time) {
+void MessageLoopImpl::PostTask(fml::closure task, fml::TimePoint target_time) {
   FML_DCHECK(task != nullptr);
   RegisterTask(task, target_time);
 }
@@ -52,7 +52,7 @@ void MessageLoopImpl::RunExpiredTasksNow() {
   RunExpiredTasks();
 }
 
-void MessageLoopImpl::AddTaskObserver(intptr_t key, fxl::Closure callback) {
+void MessageLoopImpl::AddTaskObserver(intptr_t key, fml::closure callback) {
   FML_DCHECK(callback != nullptr);
   FML_DCHECK(MessageLoop::GetCurrent().GetLoopImpl().get() == this)
       << "Message loop task observer must be added on the same thread as the "
@@ -99,8 +99,8 @@ void MessageLoopImpl::DoTerminate() {
   Terminate();
 }
 
-void MessageLoopImpl::RegisterTask(fxl::Closure task,
-                                   fxl::TimePoint target_time) {
+void MessageLoopImpl::RegisterTask(fml::closure task,
+                                   fml::TimePoint target_time) {
   FML_DCHECK(task != nullptr);
   if (terminated_) {
     // If the message loop has already been terminated, PostTask should destruct
@@ -114,7 +114,7 @@ void MessageLoopImpl::RegisterTask(fxl::Closure task,
 
 void MessageLoopImpl::RunExpiredTasks() {
   TRACE_EVENT0("fml", "MessageLoop::RunExpiredTasks");
-  std::vector<fxl::Closure> invocations;
+  std::vector<fml::closure> invocations;
 
   {
     std::lock_guard<std::mutex> lock(delayed_tasks_mutex_);
@@ -123,7 +123,7 @@ void MessageLoopImpl::RunExpiredTasks() {
       return;
     }
 
-    auto now = fxl::TimePoint::Now();
+    auto now = fml::TimePoint::Now();
     while (!delayed_tasks_.empty()) {
       const auto& top = delayed_tasks_.top();
       if (top.target_time > now) {
@@ -133,7 +133,7 @@ void MessageLoopImpl::RunExpiredTasks() {
       delayed_tasks_.pop();
     }
 
-    WakeUp(delayed_tasks_.empty() ? fxl::TimePoint::Max()
+    WakeUp(delayed_tasks_.empty() ? fml::TimePoint::Max()
                                   : delayed_tasks_.top().target_time);
   }
 
diff --git a/fml/message_loop_impl.h b/fml/message_loop_impl.h
index 9a513f238c7de4241f8b940749e93e3e949b2058..523ea7fa59536ed91971325a376d5199bbbd21c7 100644
--- a/fml/message_loop_impl.h
+++ b/fml/message_loop_impl.h
@@ -12,17 +12,17 @@
 #include <queue>
 #include <utility>
 
+#include "flutter/fml/closure.h"
 #include "flutter/fml/macros.h"
+#include "flutter/fml/memory/ref_counted.h"
 #include "flutter/fml/message_loop.h"
-#include "lib/fxl/functional/closure.h"
-#include "lib/fxl/memory/ref_counted.h"
-#include "lib/fxl/time/time_point.h"
+#include "flutter/fml/time/time_point.h"
 
 namespace fml {
 
-class MessageLoopImpl : public fxl::RefCountedThreadSafe<MessageLoopImpl> {
+class MessageLoopImpl : public fml::RefCountedThreadSafe<MessageLoopImpl> {
  public:
-  static fxl::RefPtr<MessageLoopImpl> Create();
+  static fml::RefPtr<MessageLoopImpl> Create();
 
   virtual ~MessageLoopImpl();
 
@@ -30,11 +30,11 @@ class MessageLoopImpl : public fxl::RefCountedThreadSafe<MessageLoopImpl> {
 
   virtual void Terminate() = 0;
 
-  virtual void WakeUp(fxl::TimePoint time_point) = 0;
+  virtual void WakeUp(fml::TimePoint time_point) = 0;
 
-  void PostTask(fxl::Closure task, fxl::TimePoint target_time);
+  void PostTask(fml::closure task, fml::TimePoint target_time);
 
-  void AddTaskObserver(intptr_t key, fxl::Closure callback);
+  void AddTaskObserver(intptr_t key, fml::closure callback);
 
   void RemoveTaskObserver(intptr_t key);
 
@@ -52,12 +52,12 @@ class MessageLoopImpl : public fxl::RefCountedThreadSafe<MessageLoopImpl> {
  private:
   struct DelayedTask {
     size_t order;
-    fxl::Closure task;
-    fxl::TimePoint target_time;
+    fml::closure task;
+    fml::TimePoint target_time;
 
     DelayedTask(size_t p_order,
-                fxl::Closure p_task,
-                fxl::TimePoint p_target_time)
+                fml::closure p_task,
+                fml::TimePoint p_target_time)
         : order(p_order), task(std::move(p_task)), target_time(p_target_time) {}
   };
 
@@ -71,13 +71,13 @@ class MessageLoopImpl : public fxl::RefCountedThreadSafe<MessageLoopImpl> {
   using DelayedTaskQueue = std::
       priority_queue<DelayedTask, std::deque<DelayedTask>, DelayedTaskCompare>;
 
-  std::map<intptr_t, fxl::Closure> task_observers_;
+  std::map<intptr_t, fml::closure> task_observers_;
   std::mutex delayed_tasks_mutex_;
   DelayedTaskQueue delayed_tasks_;
   size_t order_;
   std::atomic_bool terminated_;
 
-  void RegisterTask(fxl::Closure task, fxl::TimePoint target_time);
+  void RegisterTask(fml::closure task, fml::TimePoint target_time);
 
   void RunExpiredTasks();
 
diff --git a/fml/message_loop_unittests.cc b/fml/message_loop_unittests.cc
index e154c1d4add9119ec2bb14c66eaf89931fe90d04..e52a7bf93cd0c4429537269a77a02740a9ad3953 100644
--- a/fml/message_loop_unittests.cc
+++ b/fml/message_loop_unittests.cc
@@ -111,7 +111,7 @@ TEST(MessageLoop, DelayedTasksAtSameTimeAreRunInOrder) {
     auto& loop = fml::MessageLoop::GetCurrent();
     size_t current = 0;
     const auto now_plus_some =
-        fxl::TimePoint::Now() + fxl::TimeDelta::FromMilliseconds(2);
+        fml::TimePoint::Now() + fml::TimeDelta::FromMilliseconds(2);
     for (size_t i = 0; i < count; i++) {
       loop.GetTaskRunner()->PostTaskForTime(
           PLATFORM_SPECIFIC_CAPTURE(&terminated, i, &current)() {
@@ -134,7 +134,7 @@ TEST(MessageLoop, DelayedTasksAtSameTimeAreRunInOrder) {
 }
 
 TEST(MessageLoop, CheckRunsTaskOnCurrentThread) {
-  fxl::RefPtr<fxl::TaskRunner> runner;
+  fml::RefPtr<fml::TaskRunner> runner;
   fml::AutoResetWaitableEvent latch;
   std::thread thread([&runner, &latch]() {
     fml::MessageLoop::EnsureInitializedForCurrentThread();
@@ -154,17 +154,17 @@ TEST(MessageLoop, TIME_SENSITIVE(SingleDelayedTaskByDelta)) {
   std::thread thread([&checked]() {
     fml::MessageLoop::EnsureInitializedForCurrentThread();
     auto& loop = fml::MessageLoop::GetCurrent();
-    auto begin = fxl::TimePoint::Now();
+    auto begin = fml::TimePoint::Now();
     loop.GetTaskRunner()->PostDelayedTask(
         [begin, &checked]() {
-          auto delta = fxl::TimePoint::Now() - begin;
+          auto delta = fml::TimePoint::Now() - begin;
           auto ms = delta.ToMillisecondsF();
           ASSERT_GE(ms, 3);
           ASSERT_LE(ms, 7);
           checked = true;
           fml::MessageLoop::GetCurrent().Terminate();
         },
-        fxl::TimeDelta::FromMilliseconds(5));
+        fml::TimeDelta::FromMilliseconds(5));
     loop.Run();
   });
   thread.join();
@@ -176,17 +176,17 @@ TEST(MessageLoop, TIME_SENSITIVE(SingleDelayedTaskForTime)) {
   std::thread thread([&checked]() {
     fml::MessageLoop::EnsureInitializedForCurrentThread();
     auto& loop = fml::MessageLoop::GetCurrent();
-    auto begin = fxl::TimePoint::Now();
+    auto begin = fml::TimePoint::Now();
     loop.GetTaskRunner()->PostTaskForTime(
         [begin, &checked]() {
-          auto delta = fxl::TimePoint::Now() - begin;
+          auto delta = fml::TimePoint::Now() - begin;
           auto ms = delta.ToMillisecondsF();
           ASSERT_GE(ms, 3);
           ASSERT_LE(ms, 7);
           checked = true;
           fml::MessageLoop::GetCurrent().Terminate();
         },
-        fxl::TimePoint::Now() + fxl::TimeDelta::FromMilliseconds(5));
+        fml::TimePoint::Now() + fml::TimeDelta::FromMilliseconds(5));
     loop.Run();
   });
   thread.join();
@@ -200,10 +200,10 @@ TEST(MessageLoop, TIME_SENSITIVE(MultipleDelayedTasksWithIncreasingDeltas)) {
     fml::MessageLoop::EnsureInitializedForCurrentThread();
     auto& loop = fml::MessageLoop::GetCurrent();
     for (int target_ms = 0 + 2; target_ms < count + 2; target_ms++) {
-      auto begin = fxl::TimePoint::Now();
+      auto begin = fml::TimePoint::Now();
       loop.GetTaskRunner()->PostDelayedTask(
           PLATFORM_SPECIFIC_CAPTURE(begin, target_ms, &checked)() {
-            auto delta = fxl::TimePoint::Now() - begin;
+            auto delta = fml::TimePoint::Now() - begin;
             auto ms = delta.ToMillisecondsF();
             ASSERT_GE(ms, target_ms - 2);
             ASSERT_LE(ms, target_ms + 2);
@@ -212,7 +212,7 @@ TEST(MessageLoop, TIME_SENSITIVE(MultipleDelayedTasksWithIncreasingDeltas)) {
               fml::MessageLoop::GetCurrent().Terminate();
             }
           },
-          fxl::TimeDelta::FromMilliseconds(target_ms));
+          fml::TimeDelta::FromMilliseconds(target_ms));
     }
     loop.Run();
   });
@@ -227,10 +227,10 @@ TEST(MessageLoop, TIME_SENSITIVE(MultipleDelayedTasksWithDecreasingDeltas)) {
     fml::MessageLoop::EnsureInitializedForCurrentThread();
     auto& loop = fml::MessageLoop::GetCurrent();
     for (int target_ms = count + 2; target_ms > 0 + 2; target_ms--) {
-      auto begin = fxl::TimePoint::Now();
+      auto begin = fml::TimePoint::Now();
       loop.GetTaskRunner()->PostDelayedTask(
           PLATFORM_SPECIFIC_CAPTURE(begin, target_ms, &checked)() {
-            auto delta = fxl::TimePoint::Now() - begin;
+            auto delta = fml::TimePoint::Now() - begin;
             auto ms = delta.ToMillisecondsF();
             ASSERT_GE(ms, target_ms - 2);
             ASSERT_LE(ms, target_ms + 2);
@@ -239,7 +239,7 @@ TEST(MessageLoop, TIME_SENSITIVE(MultipleDelayedTasksWithDecreasingDeltas)) {
               fml::MessageLoop::GetCurrent().Terminate();
             }
           },
-          fxl::TimeDelta::FromMilliseconds(target_ms));
+          fml::TimeDelta::FromMilliseconds(target_ms));
     }
     loop.Run();
   });
diff --git a/fml/native_library.h b/fml/native_library.h
index a223802b8d5df7954db63a47b409dc48c74dd09d..6ec79d9ba0281ff896f95916bb80c0f48a4d1624 100644
--- a/fml/native_library.h
+++ b/fml/native_library.h
@@ -5,9 +5,10 @@
 #ifndef FLUTTER_FML_NATIVE_LIBRARY_H_
 #define FLUTTER_FML_NATIVE_LIBRARY_H_
 
+#include "flutter/fml/build_config.h"
 #include "flutter/fml/macros.h"
-#include "lib/fxl/memory/ref_counted.h"
-#include "lib/fxl/memory/ref_ptr.h"
+#include "flutter/fml/memory/ref_counted.h"
+#include "flutter/fml/memory/ref_ptr.h"
 
 #if OS_WIN
 
@@ -16,7 +17,7 @@
 #endif  // OS_WIN
 
 namespace fml {
-class NativeLibrary : public fxl::RefCountedThreadSafe<NativeLibrary> {
+class NativeLibrary : public fml::RefCountedThreadSafe<NativeLibrary> {
  public:
 #if OS_WIN
   using Handle = HMODULE;
@@ -24,13 +25,13 @@ class NativeLibrary : public fxl::RefCountedThreadSafe<NativeLibrary> {
   using Handle = void*;
 #endif  // OS_WIN
 
-  static fxl::RefPtr<NativeLibrary> Create(const char* path);
+  static fml::RefPtr<NativeLibrary> Create(const char* path);
 
-  static fxl::RefPtr<NativeLibrary> CreateWithHandle(
+  static fml::RefPtr<NativeLibrary> CreateWithHandle(
       Handle handle,
       bool close_handle_when_done);
 
-  static fxl::RefPtr<NativeLibrary> CreateForCurrentProcess();
+  static fml::RefPtr<NativeLibrary> CreateForCurrentProcess();
 
   const uint8_t* ResolveSymbol(const char* symbol);
 
@@ -47,8 +48,8 @@ class NativeLibrary : public fxl::RefCountedThreadSafe<NativeLibrary> {
   Handle GetHandle() const;
 
   FML_DISALLOW_COPY_AND_ASSIGN(NativeLibrary);
-  FRIEND_REF_COUNTED_THREAD_SAFE(NativeLibrary);
-  FRIEND_MAKE_REF_COUNTED(NativeLibrary);
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(NativeLibrary);
+  FML_FRIEND_MAKE_REF_COUNTED(NativeLibrary);
 };
 
 }  // namespace fml
diff --git a/fml/paths.h b/fml/paths.h
index 4e26ff818dd4f52b30c81b510ec152ea14a01388..e1b2f7dbffa3527bc4176d0fd87de0596c447d77 100644
--- a/fml/paths.h
+++ b/fml/paths.h
@@ -15,6 +15,13 @@ std::pair<bool, std::string> GetExecutableDirectoryPath();
 
 std::string JoinPaths(std::initializer_list<std::string> components);
 
+// Returns the absolute path of a possibly relative path.
+// It doesn't consult the filesystem or simplify the path.
+std::string AbsolutePath(const std::string& path);
+
+// Returns the directory name component of the given path.
+std::string GetDirectoryName(const std::string& path);
+
 }  // namespace paths
 }  // namespace fml
 
diff --git a/fml/platform/android/message_loop_android.cc b/fml/platform/android/message_loop_android.cc
index b2298cb799131562aeed914087056fe29ce32398..131f4f092258a01ffbb7e1554c3568ebdbec8a5a 100644
--- a/fml/platform/android/message_loop_android.cc
+++ b/fml/platform/android/message_loop_android.cc
@@ -82,7 +82,7 @@ void MessageLoopAndroid::Terminate() {
   ALooper_wake(looper_.get());
 }
 
-void MessageLoopAndroid::WakeUp(fxl::TimePoint time_point) {
+void MessageLoopAndroid::WakeUp(fml::TimePoint time_point) {
   bool result = TimerRearm(timer_fd_.get(), time_point);
   FML_DCHECK(result);
 }
diff --git a/fml/platform/android/message_loop_android.h b/fml/platform/android/message_loop_android.h
index 3467f41f27098ece492dd16ab4ad605b02b6af5d..8d562c70aad7c4df89cda3c0b92650d4dc4215e4 100644
--- a/fml/platform/android/message_loop_android.h
+++ b/fml/platform/android/message_loop_android.h
@@ -12,7 +12,6 @@
 #include "flutter/fml/macros.h"
 #include "flutter/fml/message_loop_impl.h"
 #include "flutter/fml/unique_fd.h"
-#include "lib/fxl/memory/unique_object.h"
 
 namespace fml {
 
@@ -36,12 +35,12 @@ class MessageLoopAndroid : public MessageLoopImpl {
 
   void Terminate() override;
 
-  void WakeUp(fxl::TimePoint time_point) override;
+  void WakeUp(fml::TimePoint time_point) override;
 
   void OnEventFired();
 
-  FRIEND_MAKE_REF_COUNTED(MessageLoopAndroid);
-  FRIEND_REF_COUNTED_THREAD_SAFE(MessageLoopAndroid);
+  FML_FRIEND_MAKE_REF_COUNTED(MessageLoopAndroid);
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(MessageLoopAndroid);
   FML_DISALLOW_COPY_AND_ASSIGN(MessageLoopAndroid);
 };
 
diff --git a/fml/platform/darwin/message_loop_darwin.h b/fml/platform/darwin/message_loop_darwin.h
index dde809860e24d39f0c1d682bd79d19306d1c5c7b..6d53e9000f821bbb8e1aa29f199579f3ed89d753 100644
--- a/fml/platform/darwin/message_loop_darwin.h
+++ b/fml/platform/darwin/message_loop_darwin.h
@@ -29,12 +29,12 @@ class MessageLoopDarwin : public MessageLoopImpl {
 
   void Terminate() override;
 
-  void WakeUp(fxl::TimePoint time_point) override;
+  void WakeUp(fml::TimePoint time_point) override;
 
   static void OnTimerFire(CFRunLoopTimerRef timer, MessageLoopDarwin* loop);
 
-  FRIEND_MAKE_REF_COUNTED(MessageLoopDarwin);
-  FRIEND_REF_COUNTED_THREAD_SAFE(MessageLoopDarwin);
+  FML_FRIEND_MAKE_REF_COUNTED(MessageLoopDarwin);
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(MessageLoopDarwin);
   FML_DISALLOW_COPY_AND_ASSIGN(MessageLoopDarwin);
 };
 
diff --git a/fml/platform/darwin/message_loop_darwin.mm b/fml/platform/darwin/message_loop_darwin.mm
index 1ba0bb2d239ca03f9fc7bd64103fb2e3e31847ec..e258d38519b6bbb075681b0691a6f626fe8dbcd9 100644
--- a/fml/platform/darwin/message_loop_darwin.mm
+++ b/fml/platform/darwin/message_loop_darwin.mm
@@ -61,12 +61,12 @@ void MessageLoopDarwin::Terminate() {
   CFRunLoopStop(loop_);
 }
 
-void MessageLoopDarwin::WakeUp(fxl::TimePoint time_point) {
+void MessageLoopDarwin::WakeUp(fml::TimePoint time_point) {
   // Rearm the timer. The time bases used by CoreFoundation and FXL are
   // different and must be accounted for.
   CFRunLoopTimerSetNextFireDate(
       delayed_wake_timer_,
-      CFAbsoluteTimeGetCurrent() + (time_point - fxl::TimePoint::Now()).ToSecondsF());
+      CFAbsoluteTimeGetCurrent() + (time_point - fml::TimePoint::Now()).ToSecondsF());
 }
 
 void MessageLoopDarwin::OnTimerFire(CFRunLoopTimerRef timer, MessageLoopDarwin* loop) {
diff --git a/fml/platform/darwin/paths_darwin.mm b/fml/platform/darwin/paths_darwin.mm
index 4419edeffb6461aa2888249da7f22060b8163e44..12e3eea7f743a15f871b00cac6a44e2b0f66da53 100644
--- a/fml/platform/darwin/paths_darwin.mm
+++ b/fml/platform/darwin/paths_darwin.mm
@@ -6,13 +6,11 @@
 
 #include <Foundation/Foundation.h>
 
-#include "lib/fxl/files/path.h"
-
 namespace fml {
 namespace paths {
 
 std::pair<bool, std::string> GetExecutableDirectoryPath() {
-  return {true, files::GetDirectoryName([NSBundle mainBundle].executablePath.UTF8String)};
+  return {true, GetDirectoryName([NSBundle mainBundle].executablePath.UTF8String)};
 }
 
 }  // namespace paths
diff --git a/fml/platform/linux/message_loop_linux.cc b/fml/platform/linux/message_loop_linux.cc
index 8effa4d188f75e8f3bf8164df0a360b4f782f704..251a0a8c3bb806e81db225bcf3f64942d3c32577 100644
--- a/fml/platform/linux/message_loop_linux.cc
+++ b/fml/platform/linux/message_loop_linux.cc
@@ -73,10 +73,10 @@ void MessageLoopLinux::Run() {
 
 void MessageLoopLinux::Terminate() {
   running_ = false;
-  WakeUp(fxl::TimePoint::Now());
+  WakeUp(fml::TimePoint::Now());
 }
 
-void MessageLoopLinux::WakeUp(fxl::TimePoint time_point) {
+void MessageLoopLinux::WakeUp(fml::TimePoint time_point) {
   bool result = TimerRearm(timer_fd_.get(), time_point);
   FML_DCHECK(result);
 }
diff --git a/fml/platform/linux/message_loop_linux.h b/fml/platform/linux/message_loop_linux.h
index dc5b862da9aa23f6f7b1ae4b211769570f398ef3..26cba078d5dcf5c3a973ebf1dd6b935a3d258a59 100644
--- a/fml/platform/linux/message_loop_linux.h
+++ b/fml/platform/linux/message_loop_linux.h
@@ -27,14 +27,14 @@ class MessageLoopLinux : public MessageLoopImpl {
 
   void Terminate() override;
 
-  void WakeUp(fxl::TimePoint time_point) override;
+  void WakeUp(fml::TimePoint time_point) override;
 
   void OnEventFired();
 
   bool AddOrRemoveTimerSource(bool add);
 
-  FRIEND_MAKE_REF_COUNTED(MessageLoopLinux);
-  FRIEND_REF_COUNTED_THREAD_SAFE(MessageLoopLinux);
+  FML_FRIEND_MAKE_REF_COUNTED(MessageLoopLinux);
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(MessageLoopLinux);
   FML_DISALLOW_COPY_AND_ASSIGN(MessageLoopLinux);
 };
 
diff --git a/fml/platform/linux/paths_linux.cc b/fml/platform/linux/paths_linux.cc
index 4a8da450efd9ddc48fc7f7a0f1266e29cfcf189f..574097072a96941f4f9e09fed05920367dca551c 100644
--- a/fml/platform/linux/paths_linux.cc
+++ b/fml/platform/linux/paths_linux.cc
@@ -6,7 +6,7 @@
 
 #include <unistd.h>
 
-#include "lib/fxl/files/path.h"
+#include "flutter/fml/paths.h"
 
 namespace fml {
 namespace paths {
diff --git a/fml/platform/linux/timerfd.cc b/fml/platform/linux/timerfd.cc
index 871b963b5b60121e5405789ed0014de398edec7a..d5be4847028303f9f86152b23faa60c25b6ffbbf 100644
--- a/fml/platform/linux/timerfd.cc
+++ b/fml/platform/linux/timerfd.cc
@@ -33,7 +33,7 @@ namespace fml {
 #define NSEC_PER_SEC 1000000000
 #endif
 
-bool TimerRearm(int fd, fxl::TimePoint time_point) {
+bool TimerRearm(int fd, fml::TimePoint time_point) {
   const uint64_t nano_secs = time_point.ToEpochDelta().ToNanoseconds();
 
   struct itimerspec spec = {};
diff --git a/fml/platform/linux/timerfd.h b/fml/platform/linux/timerfd.h
index d55a697176a7f657444c22a1c4dfc9fe0471f5fc..5c4b965457133791a23032d0b190afda3b1be8eb 100644
--- a/fml/platform/linux/timerfd.h
+++ b/fml/platform/linux/timerfd.h
@@ -5,7 +5,7 @@
 #ifndef FLUTTER_FML_PLATFORM_LINUX_TIMER_FD_H_
 #define FLUTTER_FML_PLATFORM_LINUX_TIMER_FD_H_
 
-#include "lib/fxl/time/time_point.h"
+#include "flutter/fml/time/time_point.h"
 
 // clang-format off
 #if __has_include(<sys/timerfd.h>)
@@ -41,7 +41,7 @@ int timerfd_settime(int ufc,
 namespace fml {
 
 /// Rearms the timer to expire at the given time point.
-bool TimerRearm(int fd, fxl::TimePoint time_point);
+bool TimerRearm(int fd, fml::TimePoint time_point);
 
 /// Drains the timer FD and retuns true if it has expired. This may be false in
 /// case the timer read is non-blocking and this routine was called before the
diff --git a/fml/platform/posix/file_posix.cc b/fml/platform/posix/file_posix.cc
index 58167082ced1010bdd33d854f3c6d6320e12cbf1..e043a0f340fd11cb34165754c9794168d0a2323f 100644
--- a/fml/platform/posix/file_posix.cc
+++ b/fml/platform/posix/file_posix.cc
@@ -68,4 +68,11 @@ bool IsDirectory(const fml::UniqueFD& directory) {
   return S_ISDIR(stat_result.st_mode);
 }
 
+bool IsFile(const std::string& path) {
+  struct stat buf;
+  if (stat(path.c_str(), &buf) != 0)
+    return false;
+  return S_ISREG(buf.st_mode);
+}
+
 }  // namespace fml
diff --git a/fml/platform/posix/native_library_posix.cc b/fml/platform/posix/native_library_posix.cc
index 2fd72dfb4b87f4507a1b81be758276794c1f420e..16ce46d08a3f7eb6fec82e9db8a2591af1e824fa 100644
--- a/fml/platform/posix/native_library_posix.cc
+++ b/fml/platform/posix/native_library_posix.cc
@@ -13,7 +13,7 @@ NativeLibrary::NativeLibrary(const char* path) {
   ::dlerror();
   handle_ = ::dlopen(path, RTLD_NOW);
   if (handle_ == nullptr) {
-    FXL_LOG(ERROR) << "Could not open library '" << path << "' due to error '"
+    FML_LOG(ERROR) << "Could not open library '" << path << "' due to error '"
                    << ::dlerror() << "'.";
   }
 }
@@ -30,7 +30,7 @@ NativeLibrary::~NativeLibrary() {
     ::dlerror();
     if (::dlclose(handle_) != 0) {
       handle_ = nullptr;
-      FXL_LOG(ERROR) << "Could not close library due to error '" << ::dlerror()
+      FML_LOG(ERROR) << "Could not close library due to error '" << ::dlerror()
                      << "'.";
     }
   }
@@ -40,27 +40,27 @@ NativeLibrary::Handle NativeLibrary::GetHandle() const {
   return handle_;
 }
 
-fxl::RefPtr<NativeLibrary> NativeLibrary::Create(const char* path) {
-  auto library = fxl::AdoptRef(new NativeLibrary(path));
+fml::RefPtr<NativeLibrary> NativeLibrary::Create(const char* path) {
+  auto library = fml::AdoptRef(new NativeLibrary(path));
   return library->GetHandle() != nullptr ? library : nullptr;
 }
 
-fxl::RefPtr<NativeLibrary> NativeLibrary::CreateWithHandle(
+fml::RefPtr<NativeLibrary> NativeLibrary::CreateWithHandle(
     Handle handle,
     bool close_handle_when_done) {
   auto library =
-      fxl::AdoptRef(new NativeLibrary(handle, close_handle_when_done));
+      fml::AdoptRef(new NativeLibrary(handle, close_handle_when_done));
   return library->GetHandle() != nullptr ? library : nullptr;
 }
 
-fxl::RefPtr<NativeLibrary> NativeLibrary::CreateForCurrentProcess() {
-  return fxl::AdoptRef(new NativeLibrary(RTLD_DEFAULT, false));
+fml::RefPtr<NativeLibrary> NativeLibrary::CreateForCurrentProcess() {
+  return fml::AdoptRef(new NativeLibrary(RTLD_DEFAULT, false));
 }
 
 const uint8_t* NativeLibrary::ResolveSymbol(const char* symbol) {
   auto resolved_symbol = static_cast<const uint8_t*>(::dlsym(handle_, symbol));
   if (resolved_symbol == nullptr) {
-    FXL_DLOG(INFO) << "Could not resolve symbol in library: " << symbol;
+    FML_DLOG(INFO) << "Could not resolve symbol in library: " << symbol;
   }
   return resolved_symbol;
 }
diff --git a/fml/platform/posix/paths_posix.cc b/fml/platform/posix/paths_posix.cc
new file mode 100644
index 0000000000000000000000000000000000000000..98dee43666b0feb83fc096438264b18d051c82f0
--- /dev/null
+++ b/fml/platform/posix/paths_posix.cc
@@ -0,0 +1,48 @@
+// Copyright 2018 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/paths.h"
+
+#include <limits.h>
+#include <unistd.h>
+
+#include "flutter/fml/logging.h"
+
+namespace fml {
+namespace paths {
+
+namespace {
+
+std::string GetCurrentDirectory() {
+  char buffer[PATH_MAX];
+  FML_CHECK(getcwd(buffer, sizeof(buffer)));
+  return std::string(buffer);
+}
+
+}  // namespace
+
+std::string AbsolutePath(const std::string& path) {
+  if (path.size() > 0) {
+    if (path[0] == '/') {
+      // Path is already absolute.
+      return path;
+    }
+    return GetCurrentDirectory() + "/" + path;
+  } else {
+    // Path is empty.
+    return GetCurrentDirectory();
+  }
+}
+
+std::string GetDirectoryName(const std::string& path) {
+  size_t separator = path.rfind('/');
+  if (separator == 0u)
+    return "/";
+  if (separator == std::string::npos)
+    return std::string();
+  return path.substr(0, separator);
+}
+
+}  // namespace paths
+}  // namespace fml
\ No newline at end of file
diff --git a/fml/platform/win/file_win.cc b/fml/platform/win/file_win.cc
index ad193dfe2f967b3d297f8d39f4cc21fb4bdd3623..6f182ef049380a862d7e5748930955aee928d595 100644
--- a/fml/platform/win/file_win.cc
+++ b/fml/platform/win/file_win.cc
@@ -5,12 +5,20 @@
 #include "flutter/fml/file.h"
 
 #include <Shlwapi.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <sys/stat.h>
 
 #include <algorithm>
 #include <sstream>
 
+#include "flutter/fml/build_config.h"
 #include "flutter/fml/platform/win/wstring_conversion.h"
 
+#if defined(OS_WIN)
+#define S_ISREG(m) (((m)&S_IFMT) == S_IFREG)
+#endif
+
 namespace fml {
 
 static fml::UniqueFD OpenFile(std::wstring path,
@@ -124,4 +132,11 @@ bool IsDirectory(const fml::UniqueFD& directory) {
   return info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
 }
 
+bool IsFile(const std::string& path) {
+  struct stat buf;
+  if (stat(path.c_str(), &buf) != 0)
+    return false;
+  return S_ISREG(buf.st_mode);
+}
+
 }  // namespace fml
diff --git a/fml/platform/win/message_loop_win.cc b/fml/platform/win/message_loop_win.cc
index 5211fd2c162a848fc57f6a828f568306e2625ce9..58f1569dd167996994f0d058efccc1996872a491 100644
--- a/fml/platform/win/message_loop_win.cc
+++ b/fml/platform/win/message_loop_win.cc
@@ -26,12 +26,12 @@ void MessageLoopWin::Run() {
 
 void MessageLoopWin::Terminate() {
   running_ = false;
-  WakeUp(fxl::TimePoint::Now());
+  WakeUp(fml::TimePoint::Now());
 }
 
-void MessageLoopWin::WakeUp(fxl::TimePoint time_point) {
+void MessageLoopWin::WakeUp(fml::TimePoint time_point) {
   LARGE_INTEGER due_time = {0};
-  fxl::TimePoint now = fxl::TimePoint::Now();
+  fml::TimePoint now = fml::TimePoint::Now();
   if (time_point > now) {
     due_time.QuadPart = (time_point - now).ToNanoseconds() / -100;
   }
diff --git a/fml/platform/win/message_loop_win.h b/fml/platform/win/message_loop_win.h
index 22836c68746b4b8ca5c0be2ede6ffc655a9e4723..aeb784b45e490e89a6b7237540c3859acf4202c8 100644
--- a/fml/platform/win/message_loop_win.h
+++ b/fml/platform/win/message_loop_win.h
@@ -11,7 +11,7 @@
 
 #include "flutter/fml/macros.h"
 #include "flutter/fml/message_loop_impl.h"
-#include "lib/fxl/memory/unique_object.h"
+#include "flutter/fml/unique_object.h"
 
 namespace fml {
 
@@ -24,7 +24,7 @@ class MessageLoopWin : public MessageLoopImpl {
   };
 
   bool running_;
-  fxl::UniqueObject<HANDLE, UniqueHandleTraits> timer_;
+  fml::UniqueObject<HANDLE, UniqueHandleTraits> timer_;
 
   MessageLoopWin();
 
@@ -34,10 +34,10 @@ class MessageLoopWin : public MessageLoopImpl {
 
   void Terminate() override;
 
-  void WakeUp(fxl::TimePoint time_point) override;
+  void WakeUp(fml::TimePoint time_point) override;
 
-  FRIEND_MAKE_REF_COUNTED(MessageLoopWin);
-  FRIEND_REF_COUNTED_THREAD_SAFE(MessageLoopWin);
+  FML_FRIEND_MAKE_REF_COUNTED(MessageLoopWin);
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(MessageLoopWin);
   FML_DISALLOW_COPY_AND_ASSIGN(MessageLoopWin);
 };
 
diff --git a/fml/platform/win/native_library_win.cc b/fml/platform/win/native_library_win.cc
index 55da45fcd1fc017ae2067fafee1ed1054274de62..1ff997219bfb48a4156d717cceae298dd63604d1 100644
--- a/fml/platform/win/native_library_win.cc
+++ b/fml/platform/win/native_library_win.cc
@@ -32,21 +32,21 @@ NativeLibrary::Handle NativeLibrary::GetHandle() const {
   return handle_;
 }
 
-fxl::RefPtr<NativeLibrary> NativeLibrary::Create(const char* path) {
-  auto library = fxl::AdoptRef(new NativeLibrary(path));
+fml::RefPtr<NativeLibrary> NativeLibrary::Create(const char* path) {
+  auto library = fml::AdoptRef(new NativeLibrary(path));
   return library->GetHandle() != nullptr ? library : nullptr;
 }
 
-fxl::RefPtr<NativeLibrary> NativeLibrary::CreateWithHandle(
+fml::RefPtr<NativeLibrary> NativeLibrary::CreateWithHandle(
     Handle handle,
     bool close_handle_when_done) {
   auto library =
-      fxl::AdoptRef(new NativeLibrary(handle, close_handle_when_done));
+      fml::AdoptRef(new NativeLibrary(handle, close_handle_when_done));
   return library->GetHandle() != nullptr ? library : nullptr;
 }
 
-fxl::RefPtr<NativeLibrary> NativeLibrary::CreateForCurrentProcess() {
-  return fxl::AdoptRef(new NativeLibrary(::GetModuleHandle(nullptr), false));
+fml::RefPtr<NativeLibrary> NativeLibrary::CreateForCurrentProcess() {
+  return fml::AdoptRef(new NativeLibrary(::GetModuleHandle(nullptr), false));
 }
 
 const uint8_t* NativeLibrary::ResolveSymbol(const char* symbol) {
diff --git a/fml/platform/win/paths_win.cc b/fml/platform/win/paths_win.cc
index 80b71d7a513e343c559985701e6e6577a61130ec..b64aa25fff551e05c62e25ef4c599dae9e6acba8 100644
--- a/fml/platform/win/paths_win.cc
+++ b/fml/platform/win/paths_win.cc
@@ -6,11 +6,48 @@
 
 #include <windows.h>
 
-#include "lib/fxl/files/path.h"
+#include "flutter/fml/paths.h"
 
 namespace fml {
 namespace paths {
 
+namespace {
+
+size_t RootLength(const std::string& path) {
+  if (path.size() == 0)
+    return 0;
+  if (path[0] == '/')
+    return 1;
+  if (path[0] == '\\') {
+    if (path.size() < 2 || path[1] != '\\')
+      return 1;
+    // The path is a network share. Search for up to two '\'s, as they are
+    // the server and share - and part of the root part.
+    size_t index = path.find('\\', 2);
+    if (index > 0) {
+      index = path.find('\\', index + 1);
+      if (index > 0)
+        return index;
+    }
+    return path.size();
+  }
+  // If the path is of the form 'C:/' or 'C:\', with C being any letter, it's
+  // a root part.
+  if (path.length() >= 2 && path[1] == ':' &&
+      (path[2] == '/' || path[2] == '\\') &&
+      ((path[0] >= 'A' && path[0] <= 'Z') ||
+       (path[0] >= 'a' && path[0] <= 'z'))) {
+    return 3;
+  }
+  return 0;
+}
+
+size_t LastSeparator(const std::string& path) {
+  return path.find_last_of("/\\");
+}
+
+}  // namespace
+
 std::pair<bool, std::string> GetExecutableDirectoryPath() {
   HMODULE module = GetModuleHandle(NULL);
   if (module == NULL) {
@@ -21,7 +58,23 @@ std::pair<bool, std::string> GetExecutableDirectoryPath() {
   if (read_size == 0 || read_size == MAX_PATH) {
     return {false, ""};
   }
-  return {true, files::GetDirectoryName(std::string{path, read_size})};
+  return {true, GetDirectoryName(std::string{path, read_size})};
+}
+
+std::string AbsolutePath(const std::string& path) {
+  char absPath[MAX_PATH];
+  _fullpath(absPath, path.c_str(), MAX_PATH);
+  return std::string(absPath);
+}
+
+std::string GetDirectoryName(const std::string& path) {
+  size_t rootLength = RootLength(path);
+  size_t separator = LastSeparator(path);
+  if (separator < rootLength)
+    separator = rootLength;
+  if (separator == std::string::npos)
+    return std::string();
+  return path.substr(0, separator);
 }
 
 }  // namespace paths
diff --git a/fml/string_view.cc b/fml/string_view.cc
new file mode 100644
index 0000000000000000000000000000000000000000..52af03b1309f61a7bf721c2d67664ee39c4d0921
--- /dev/null
+++ b/fml/string_view.cc
@@ -0,0 +1,212 @@
+// Copyright 2016 The Fuchsia Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/string_view.h"
+
+#include <string.h>
+
+#include <algorithm>
+#include <limits>
+
+namespace fml {
+
+constexpr size_t StringView::npos;
+
+namespace {
+
+// For each character in characters_wanted, sets the index corresponding
+// to the code for that character to 1 in table.  This is used by the
+// find_.*_of methods below to tell whether or not a character is in the lookup
+// table in constant time.
+// The argument `table' must be an array that is large enough to hold all
+// the possible values of an unsigned char.  Thus it should be be declared
+// as follows:
+//   bool table[std::numeric_limits<unsigned char>::max() + 1]
+inline void BuildLookupTable(StringView characters_wanted, bool* table) {
+  size_t length = characters_wanted.size();
+  const char* data = characters_wanted.data();
+  for (size_t i = 0; i < length; ++i) {
+    table[static_cast<unsigned char>(data[i])] = true;
+  }
+}
+
+}  // namespace
+
+int StringView::compare(StringView other) {
+  size_t len = std::min(size_, other.size_);
+  int retval = memcmp(data_, other.data_, len);
+  if (retval == 0) {
+    if (size_ == other.size_) {
+      return 0;
+    }
+    return size_ < other.size_ ? -1 : 1;
+  }
+  return retval;
+}
+
+bool operator==(StringView lhs, StringView rhs) {
+  if (lhs.size() != rhs.size())
+    return false;
+  return lhs.compare(rhs) == 0;
+}
+
+bool operator!=(StringView lhs, StringView rhs) {
+  if (lhs.size() != rhs.size())
+    return true;
+  return lhs.compare(rhs) != 0;
+}
+
+bool operator<(StringView lhs, StringView rhs) {
+  return lhs.compare(rhs) < 0;
+}
+
+bool operator>(StringView lhs, StringView rhs) {
+  return lhs.compare(rhs) > 0;
+}
+
+bool operator<=(StringView lhs, StringView rhs) {
+  return lhs.compare(rhs) <= 0;
+}
+
+bool operator>=(StringView lhs, StringView rhs) {
+  return lhs.compare(rhs) >= 0;
+}
+
+std::ostream& operator<<(std::ostream& o, StringView string_view) {
+  o.write(string_view.data(), static_cast<std::streamsize>(string_view.size()));
+  return o;
+}
+
+size_t StringView::find(StringView s, size_t pos) const {
+  if (pos > size_)
+    return npos;
+  if (s.empty())
+    return pos;
+
+  auto result = std::search(begin() + pos, end(), s.begin(), s.end());
+  if (result == end())
+    return npos;
+  return result - begin();
+}
+
+size_t StringView::find(char c, size_t pos) const {
+  if (pos > size_)
+    return npos;
+
+  auto result = std::find(begin() + pos, end(), c);
+  if (result == end())
+    return npos;
+  return result - begin();
+}
+
+size_t StringView::rfind(StringView s, size_t pos) const {
+  if (size_ < s.size())
+    return npos;
+  if (s.empty())
+    return std::min(pos, size_);
+
+  auto last = begin() + std::min(size_ - s.size(), pos) + s.size();
+  auto result = std::find_end(begin(), last, s.begin(), s.end());
+  if (result == last)
+    return npos;
+  return result - begin();
+}
+
+size_t StringView::rfind(char c, size_t pos) const {
+  if (size_ == 0)
+    return npos;
+
+  auto begin = rend() - std::min(size_ - 1, pos) - 1;
+  auto result = std::find(begin, rend(), c);
+  if (result == rend())
+    return npos;
+  return rend() - result - 1;
+}
+
+size_t StringView::find_first_of(StringView s, size_t pos) const {
+  if (pos >= size_ || s.size() == 0)
+    return npos;
+
+  // Avoid the cost of BuildLookupTable() for a single-character search.
+  if (s.size() == 1)
+    return find(s.data()[0], pos);
+
+  bool lookup[std::numeric_limits<unsigned char>::max() + 1] = {false};
+  BuildLookupTable(s, lookup);
+  for (size_t i = pos; i < size_; ++i) {
+    if (lookup[static_cast<unsigned char>(data_[i])]) {
+      return i;
+    }
+  }
+  return npos;
+}
+
+size_t StringView::find_last_of(StringView s, size_t pos) const {
+  if (size_ == 0 || s.size() == 0)
+    return npos;
+
+  // Avoid the cost of BuildLookupTable() for a single-character search.
+  if (s.size() == 1)
+    return rfind(s.data()[0], pos);
+
+  bool lookup[std::numeric_limits<unsigned char>::max() + 1] = {false};
+  BuildLookupTable(s, lookup);
+  for (size_t i = std::min(pos, size_ - 1);; --i) {
+    if (lookup[static_cast<unsigned char>(data_[i])])
+      return i;
+    if (i == 0)
+      break;
+  }
+  return npos;
+}
+
+size_t StringView::find_first_not_of(StringView s, size_t pos) const {
+  if (pos >= size_)
+    return npos;
+
+  // Avoid the cost of BuildLookupTable() for a single-character search.
+  if (s.size() == 1) {
+    for (size_t i = pos; i < size_; ++i) {
+      if (data_[i] != s[0])
+        return i;
+    }
+    return npos;
+  }
+
+  bool lookup[std::numeric_limits<unsigned char>::max() + 1] = {false};
+  BuildLookupTable(s, lookup);
+  for (size_t i = pos; i < size_; ++i) {
+    if (!lookup[static_cast<unsigned char>(data_[i])]) {
+      return i;
+    }
+  }
+  return npos;
+}
+
+size_t StringView::find_last_not_of(StringView s, size_t pos) const {
+  if (size_ == 0)
+    return npos;
+
+  // Avoid the cost of BuildLookupTable() for a single-character search.
+  if (s.size() == 1) {
+    for (size_t i = std::min(pos, size_ - 1);; --i) {
+      if (data_[i] != s[0])
+        return i;
+      if (i == 0)
+        break;
+    }
+  }
+
+  bool lookup[std::numeric_limits<unsigned char>::max() + 1] = {false};
+  BuildLookupTable(s, lookup);
+  for (size_t i = std::min(pos, size_ - 1);; --i) {
+    if (!lookup[static_cast<unsigned char>(data_[i])])
+      return i;
+    if (i == 0)
+      break;
+  }
+  return npos;
+}
+
+}  // namespace fml
diff --git a/fml/string_view.h b/fml/string_view.h
new file mode 100644
index 0000000000000000000000000000000000000000..d4f34a45dfc60bd0199f3abbff83384fe3c1bc77
--- /dev/null
+++ b/fml/string_view.h
@@ -0,0 +1,167 @@
+// Copyright 2016 The Fuchsia 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 FLUTTER_FML_STRING_VIEW_H_
+#define FLUTTER_FML_STRING_VIEW_H_
+
+#include <iosfwd>
+#include <string>
+#include <type_traits>
+
+#include "flutter/fml/logging.h"
+
+// MSVC 2015 doesn't support "extended constexpr" from C++14.
+#if __cplusplus >= 201402L
+// C++14 relaxed the limitation of the content of a constexpr function.
+#define CONSTEXPR_IN_CPP14 constexpr
+#else
+#define CONSTEXPR_IN_CPP14
+#endif
+
+namespace fml {
+
+// A string-like object that points to a sized piece of memory.
+class StringView {
+ public:
+  // Types.
+  using const_iterator = const char*;
+  using iterator = const_iterator;
+  using const_reverse_iterator = std::reverse_iterator<const_iterator>;
+  using reverse_iterator = const_reverse_iterator;
+
+  constexpr static size_t npos = static_cast<size_t>(-1);
+
+  // Constructors.
+  constexpr StringView() : data_(""), size_(0u) {}
+
+  constexpr StringView(const StringView& string_view)
+      : data_(string_view.data_), size_(string_view.size_) {}
+
+  constexpr StringView(const char* str, size_t len) : data_(str), size_(len) {}
+
+  explicit constexpr StringView(const char* str)
+      : data_(str), size_(constexpr_strlen(str)) {}
+
+  // Implicit constructor for constant C strings.
+  template <size_t N>
+  constexpr StringView(const char (&str)[N])
+      : data_(str), size_(constexpr_strlen(str)) {}
+
+  // Implicit constructor.
+  StringView(const std::string& str) : data_(str.data()), size_(str.size()) {}
+
+  // Copy operators.
+  StringView& operator=(const StringView& other) {
+    data_ = other.data_;
+    size_ = other.size_;
+    return *this;
+  }
+
+  // Capacity methods.
+  constexpr size_t size() const { return size_; }
+  constexpr bool empty() const { return size_ == 0u; }
+
+  // Element access methods.
+  constexpr char operator[](size_t pos) const { return data_[pos]; };
+  constexpr char at(size_t pos) const { return data_[pos]; };
+  constexpr char front() const { return data_[0]; };
+  constexpr char back() const { return data_[size_ - 1]; };
+  constexpr const char* data() const { return data_; }
+
+  // Iterators.
+  constexpr const_iterator begin() const { return cbegin(); }
+  constexpr const_iterator end() const { return cend(); }
+  constexpr const_iterator cbegin() const { return data_; }
+  constexpr const_iterator cend() const { return data_ + size_; }
+  const_reverse_iterator rbegin() const {
+    return const_reverse_iterator(cend());
+  }
+  const_reverse_iterator rend() const {
+    return const_reverse_iterator(cbegin());
+  }
+  const_reverse_iterator crbegin() const {
+    return const_reverse_iterator(cend());
+  }
+  const_reverse_iterator crend() const {
+    return const_reverse_iterator(cbegin());
+  }
+
+  // Modifier methods.
+  CONSTEXPR_IN_CPP14 void clear() {
+    data_ = "";
+    size_ = 0;
+  }
+  CONSTEXPR_IN_CPP14 void remove_prefix(size_t n) {
+    FML_DCHECK(n <= size_);
+    data_ += n;
+    size_ -= n;
+  }
+  CONSTEXPR_IN_CPP14 void remove_suffix(size_t n) {
+    FML_DCHECK(n <= size_);
+    size_ -= n;
+  }
+  CONSTEXPR_IN_CPP14 void swap(StringView& other) {
+    const char* data = data_;
+    data_ = other.data_;
+    other.data_ = data;
+
+    size_t size = size_;
+    size_ = other.size_;
+    other.size_ = size;
+  }
+
+  // String conversion.
+  std::string ToString() const { return std::string(data_, size_); }
+
+  // String operations.
+  constexpr StringView substr(size_t pos = 0, size_t n = npos) const {
+    return StringView(data_ + pos, min(n, size_ - pos));
+  }
+
+  // Returns negative, 0, or positive when |this| is lexigraphically
+  // less than, equal to, or greater than |other|, a la
+  // std::basic_string_view::compare.
+  int compare(StringView other);
+
+  size_t find(StringView s, size_t pos = 0) const;
+  size_t find(char c, size_t pos = 0) const;
+  size_t rfind(StringView s, size_t pos = npos) const;
+  size_t rfind(char c, size_t pos = npos) const;
+  size_t find_first_of(StringView s, size_t pos = 0) const;
+  size_t find_last_of(StringView s, size_t pos = npos) const;
+  size_t find_first_not_of(StringView s, size_t pos = 0) const;
+  size_t find_last_not_of(StringView s, size_t pos = npos) const;
+
+ private:
+  constexpr static size_t min(size_t v1, size_t v2) {
+    return v1 < v2 ? v1 : v2;
+  }
+
+  constexpr static int constexpr_strlen(const char* str) {
+#if defined(_MSC_VER)
+    return *str ? 1 + constexpr_strlen(str + 1) : 0;
+#else
+    return __builtin_strlen(str);
+#endif
+  }
+
+  const char* data_;
+  size_t size_;
+};
+
+// Comparison.
+
+bool operator==(StringView lhs, StringView rhs);
+bool operator!=(StringView lhs, StringView rhs);
+bool operator<(StringView lhs, StringView rhs);
+bool operator>(StringView lhs, StringView rhs);
+bool operator<=(StringView lhs, StringView rhs);
+bool operator>=(StringView lhs, StringView rhs);
+
+// IO.
+std::ostream& operator<<(std::ostream& o, StringView string_view);
+
+}  // namespace fml
+
+#endif  // FLUTTER_FML_STRING_VIEW_H_
diff --git a/fml/string_view_unittest.cc b/fml/string_view_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8dab1500ff7ca728b4003ab20de6476926512882
--- /dev/null
+++ b/fml/string_view_unittest.cc
@@ -0,0 +1,418 @@
+// Copyright 2016 The Fuchsia Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/string_view.h"
+
+#include <functional>
+
+#include "gtest/gtest.h"
+
+namespace fml {
+namespace {
+
+#define TEST_STRING "Hello\0u"
+#define TEST_STRING_LENGTH 5u
+
+// Loops over all substrings of |needles|, and calls |callback| for each.
+void LoopOverSubstrings(StringView haystack,
+                        StringView needles,
+                        std::function<void(std::string haystack_str,
+                                           StringView haystack_sw,
+                                           std::string to_find_str,
+                                           StringView to_find_sw,
+                                           int start_index)> callback) {
+  std::string haystack_str = haystack.ToString();
+  for (size_t substring_size = 0; substring_size < needles.size();
+       ++substring_size) {
+    for (size_t start_index = 0; start_index <= needles.size(); ++start_index) {
+      auto to_find = needles.substr(start_index, substring_size);
+      for (size_t start_pos = 0; start_pos <= haystack.size(); ++start_pos) {
+        callback(haystack_str, haystack, to_find.ToString(), to_find,
+                 start_pos);
+      }
+    }
+  }
+};
+
+// Loops over all characters in |needles|, and calls |callback| for each.
+void LoopOverChars(StringView haystack,
+                   StringView needles,
+                   std::function<void(std::string haystack_str,
+                                      StringView haystack_sw,
+                                      char c,
+                                      int start_index)> callback) {
+  std::string haystack_str = haystack.ToString();
+  for (size_t index = 0; index < needles.size(); ++index) {
+    for (size_t start_index = 0; start_index <= haystack.size();
+         ++start_index) {
+      callback(haystack_str, haystack, needles[index], start_index);
+    }
+  }
+}
+
+// Loops over all combinations of characters present in |needles|, and calls
+// |callback| for each.
+void LoopOverCharCombinations(StringView haystack,
+                              StringView needles,
+                              std::function<void(std::string haystack_str,
+                                                 StringView haystack_sw,
+                                                 std::string current_chars,
+                                                 size_t pos)> callback) {
+  // Look for all chars combinations, and compare with string.
+  std::set<char> chars(needles.begin(), needles.end());
+  std::string haystack_str = haystack.ToString();
+  for (size_t selector = 0; selector < (1 << chars.size()); ++selector) {
+    std::string current_chars;
+    size_t current = selector;
+    for (auto it = chars.begin(); it != chars.end(); ++it) {
+      if (current & 1)
+        current_chars += *it;
+      current = current >> 1;
+    }
+    for (size_t pos = 0; pos <= haystack.size(); ++pos) {
+      callback(haystack_str, haystack, current_chars, pos);
+    }
+  }
+}
+
+TEST(StringView, Constructors) {
+  std::string str1("Hello");
+  StringView sw1(str1);
+  EXPECT_EQ(str1.data(), sw1.data());
+  EXPECT_EQ(str1.size(), sw1.size());
+  EXPECT_EQ(TEST_STRING_LENGTH, sw1.size());
+
+  const char* str2 = str1.data();
+  StringView sw2(str2);
+  EXPECT_EQ(str1.data(), sw2.data());
+  EXPECT_EQ(TEST_STRING_LENGTH, sw2.size());
+}
+
+TEST(StringView, ConstExprConstructors) {
+  constexpr StringView sw1;
+  EXPECT_EQ(0u, sw1.size());
+
+  constexpr StringView sw2(sw1);
+  EXPECT_EQ(0u, sw2.size());
+  EXPECT_EQ(sw1.data(), sw2.data());
+
+  constexpr StringView sw3(TEST_STRING, TEST_STRING_LENGTH);
+  EXPECT_EQ(TEST_STRING_LENGTH, sw3.size());
+
+  constexpr StringView sw4(TEST_STRING);
+  EXPECT_EQ(TEST_STRING_LENGTH, sw4.size());
+
+  constexpr const char* string_ptr = TEST_STRING;
+  constexpr StringView sw5(string_ptr);
+  EXPECT_EQ(TEST_STRING_LENGTH, sw5.size());
+}
+
+TEST(StringView, CopyOperator) {
+  StringView sw1;
+
+  StringView sw2(TEST_STRING);
+  sw1 = sw2;
+  EXPECT_EQ(sw2.data(), sw1.data());
+
+  sw1 = TEST_STRING;
+  EXPECT_EQ(TEST_STRING_LENGTH, sw1.size());
+
+  sw1 = std::string(TEST_STRING);
+  EXPECT_EQ(TEST_STRING_LENGTH, sw1.size());
+}
+
+TEST(StringView, CapacityMethods) {
+  StringView sw1;
+  EXPECT_EQ(0u, sw1.size());
+  EXPECT_TRUE(sw1.empty());
+
+  StringView sw2(TEST_STRING);
+  EXPECT_EQ(TEST_STRING_LENGTH, sw2.size());
+  EXPECT_FALSE(sw2.empty());
+}
+
+TEST(StringView, AccessMethods) {
+  const char* str = TEST_STRING;
+  StringView sw1(str);
+
+  EXPECT_EQ('H', sw1.front());
+  EXPECT_EQ('e', sw1[1]);
+  EXPECT_EQ('l', sw1.at(2));
+  EXPECT_EQ('o', sw1.back());
+  EXPECT_EQ(str, sw1.data());
+}
+
+TEST(StringView, Iterators) {
+  StringView sw1(TEST_STRING);
+
+  std::string str1(sw1.begin(), sw1.end());
+  EXPECT_EQ(TEST_STRING, str1);
+
+  std::string str2(sw1.cbegin(), sw1.cend());
+  EXPECT_EQ(TEST_STRING, str2);
+
+  std::string str3(sw1.rbegin(), sw1.rend());
+  EXPECT_EQ("olleH", str3);
+
+  std::string str4(sw1.crbegin(), sw1.crend());
+  EXPECT_EQ("olleH", str4);
+}
+
+TEST(StringView, Modifiers) {
+  StringView sw1(TEST_STRING);
+
+  sw1.remove_prefix(1);
+  EXPECT_EQ("ello", sw1.ToString());
+
+  sw1.remove_suffix(1);
+  EXPECT_EQ("ell", sw1.ToString());
+
+  sw1.clear();
+  EXPECT_EQ(0u, sw1.size());
+
+  StringView sw2(TEST_STRING);
+  sw1.swap(sw2);
+  EXPECT_EQ(0u, sw2.size());
+  EXPECT_EQ(TEST_STRING, sw1.ToString());
+}
+
+TEST(StringView, SubString) {
+  StringView sw1(TEST_STRING);
+
+  StringView sw2 = sw1.substr(1, 2);
+  EXPECT_EQ("el", sw2.ToString());
+}
+
+TEST(StringView, Compare) {
+  StringView sw1(TEST_STRING);
+  StringView sw2(TEST_STRING);
+
+  EXPECT_EQ(0, sw1.compare(sw2));
+
+  sw1 = "a";
+  sw2 = "b";
+  EXPECT_GT(0, sw1.compare(sw2));
+  EXPECT_LT(0, sw2.compare(sw1));
+
+  sw1 = "a";
+  sw2 = "aa";
+  EXPECT_GT(0, sw1.compare(sw2));
+  EXPECT_LT(0, sw2.compare(sw1));
+
+  std::string str1("a\0a", 3);
+  std::string str2("a\0b", 3);
+  sw1 = str1;
+  sw2 = str2;
+
+  EXPECT_GT(0, sw1.compare(sw2));
+  EXPECT_LT(0, sw2.compare(sw1));
+}
+
+TEST(StringView, ComparaisonFunctions) {
+  StringView sw1 = "a";
+  StringView sw2 = "b";
+
+  EXPECT_TRUE(sw1 == sw1);
+  EXPECT_FALSE(sw1 == sw2);
+  EXPECT_FALSE(sw1 != sw1);
+  EXPECT_TRUE(sw1 != sw2);
+
+  EXPECT_TRUE(sw1 < sw2);
+  EXPECT_FALSE(sw2 < sw1);
+  EXPECT_TRUE(sw1 <= sw1);
+  EXPECT_TRUE(sw1 <= sw2);
+  EXPECT_FALSE(sw2 <= sw1);
+
+  EXPECT_TRUE(sw2 > sw1);
+  EXPECT_FALSE(sw1 > sw2);
+  EXPECT_TRUE(sw1 >= sw1);
+  EXPECT_TRUE(sw2 >= sw1);
+  EXPECT_FALSE(sw1 >= sw2);
+}
+
+TEST(StringView, Stream) {
+  StringView sw1(TEST_STRING);
+
+  std::stringstream ss;
+  ss << sw1;
+  EXPECT_EQ(TEST_STRING, ss.str());
+}
+
+TEST(StringView, find_String) {
+  StringView sw("Hello World");
+
+  EXPECT_EQ(StringView::npos, sw.find("z"));
+  EXPECT_EQ(StringView::npos, sw.find("  "));
+  EXPECT_EQ(StringView::npos, sw.find("lll"));
+  EXPECT_EQ(StringView::npos, sw.find("H", 1));
+  EXPECT_EQ(StringView::npos, sw.find("H", 255));
+  EXPECT_EQ(StringView::npos, sw.find("H", sw.size()));
+
+  auto test_callback = [](std::string haystack_str, StringView haystack_sw,
+                          std::string to_find_str, StringView to_find_sw,
+                          int start_index) {
+    EXPECT_EQ(haystack_str.find(to_find_str, start_index),
+              haystack_sw.find(to_find_sw, start_index));
+  };
+  LoopOverSubstrings(sw, sw, test_callback);
+
+  // Use another string for negative examples.
+  StringView other_sw("Fuchsia World");
+  LoopOverSubstrings(sw, other_sw, test_callback);
+}
+
+TEST(StringView, find_Chars) {
+  StringView sw("Hello World");
+
+  EXPECT_EQ(StringView::npos, sw.find('z'));
+  EXPECT_EQ(StringView::npos, sw.find('H', 1));
+  EXPECT_EQ(StringView::npos, sw.find('H', 255));
+  EXPECT_EQ(StringView::npos, sw.find('H', sw.size()));
+
+  auto test_callback = [](std::string haystack_str, StringView haystack_sw,
+                          char c, int start_index) {
+    EXPECT_EQ(haystack_str.find(c, start_index),
+              haystack_sw.find(c, start_index));
+  };
+
+  // Look for all chars at all position, and compare with string.
+  LoopOverChars(sw, sw, test_callback);
+
+  // Use another string for negative examples.
+  StringView other_sw("Fuchsia World");
+  LoopOverChars(sw, other_sw, test_callback);
+}
+
+TEST(StringView, rfind_String) {
+  StringView sw("Hello World");
+
+  EXPECT_EQ(StringView::npos, sw.rfind("z"));
+  EXPECT_EQ(StringView::npos, sw.rfind("  "));
+  EXPECT_EQ(StringView::npos, sw.rfind("lll"));
+  EXPECT_EQ(StringView::npos, sw.rfind("d", sw.size() - 2));
+  EXPECT_EQ(StringView::npos, sw.rfind("d", 0));
+  EXPECT_EQ(StringView::npos, sw.rfind("d", 1));
+
+  // Look for all substring at all position, and compare with string.
+  auto test_callback = [](std::string haystack_str, StringView haystack_sw,
+                          std::string to_find_str, StringView to_find_sw,
+                          int start_index) {
+    EXPECT_EQ(haystack_str.rfind(to_find_str, start_index),
+              haystack_sw.rfind(to_find_sw, start_index));
+  };
+  LoopOverSubstrings(sw, sw, test_callback);
+
+  // Use another string for negative examples.
+  StringView other_sw("Fuchsia World");
+  LoopOverSubstrings(sw, other_sw, test_callback);
+}
+
+TEST(StringView, rfind_Char) {
+  StringView sw("Hello World");
+
+  EXPECT_EQ(StringView::npos, sw.rfind('z'));
+  EXPECT_EQ(StringView::npos, sw.rfind('d', sw.size() - 2));
+  EXPECT_EQ(StringView::npos, sw.rfind('d', 0));
+  EXPECT_EQ(StringView::npos, sw.rfind('d', 1));
+
+  auto test_callback = [](std::string haystack_str, StringView haystack_sw,
+                          char c, int start_index) {
+    EXPECT_EQ(haystack_str.rfind(c, start_index),
+              haystack_sw.rfind(c, start_index));
+  };
+
+  // Look for all chars at all position, and compare with string.
+  LoopOverChars(sw, sw, test_callback);
+
+  // Use another string for negative examples.
+  StringView other_sw("Fuchsia World");
+  LoopOverChars(sw, other_sw, test_callback);
+}
+
+TEST(StringView, find_first_of) {
+  StringView sw("Hello World");
+
+  EXPECT_EQ(StringView::npos, sw.find_first_of(""));
+  EXPECT_EQ(StringView::npos, sw.find_first_of(std::string("xyz")));
+  EXPECT_EQ(StringView::npos, sw.find_first_of("xyHz", 1));
+  EXPECT_EQ(StringView::npos, sw.find_first_of("Hello World", sw.size()));
+
+  auto test_callback = [](std::string haystack_str, StringView haystack_sw,
+                          std::string current_chars, size_t pos) {
+    EXPECT_EQ(haystack_str.find_first_of(current_chars, pos),
+              haystack_sw.find_first_of(current_chars, pos));
+  };
+
+  // Look for all chars combinations, and compare with string.
+  LoopOverCharCombinations(sw, sw, test_callback);
+
+  // Use another string for negative examples.
+  StringView other_sw("Fuchsia World");
+  LoopOverCharCombinations(sw, other_sw, test_callback);
+}
+
+TEST(StringView, find_last_of) {
+  StringView sw("Hello World");
+
+  EXPECT_EQ(StringView::npos, sw.find_last_of(""));
+  EXPECT_EQ(StringView::npos, sw.find_last_of(std::string("xyz")));
+  EXPECT_EQ(StringView::npos, sw.find_last_of("xydz", 1));
+
+  auto test_callback = [](std::string haystack_str, StringView haystack_sw,
+                          std::string current_chars, size_t pos) {
+    EXPECT_EQ(haystack_str.find_last_of(current_chars, pos),
+              haystack_sw.find_last_of(current_chars, pos));
+  };
+
+  // Look for all chars combinations, and compare with string.
+  LoopOverCharCombinations(sw, sw, test_callback);
+
+  // Use another string for negative examples.
+  StringView other_sw("Fuchsia World");
+  LoopOverCharCombinations(sw, other_sw, test_callback);
+}
+
+TEST(StringView, find_first_not_of) {
+  StringView sw("Hello World");
+
+  EXPECT_EQ(StringView::npos, sw.find_first_not_of("Helo Wrd"));
+  EXPECT_EQ(StringView::npos, sw.find_first_not_of("elo Wrd", 1));
+  EXPECT_EQ(StringView::npos, sw.find_first_not_of("", sw.size()));
+
+  auto test_callback = [](std::string haystack_str, StringView haystack_sw,
+                          std::string current_chars, size_t pos) {
+    EXPECT_EQ(haystack_str.find_first_not_of(current_chars, pos),
+              haystack_sw.find_first_not_of(current_chars, pos));
+  };
+
+  // Look for all chars combinations, and compare with string.
+  LoopOverCharCombinations(sw, sw, test_callback);
+
+  // Use another string for negative examples.
+  StringView other_sw("Fuchsia World");
+  LoopOverCharCombinations(sw, other_sw, test_callback);
+}
+
+TEST(StringView, find_last_not_of) {
+  StringView sw("Hello World");
+
+  EXPECT_EQ(StringView::npos, sw.find_last_not_of("Helo Wrd"));
+  EXPECT_EQ(StringView::npos, sw.find_last_not_of("H", 0));
+
+  auto test_callback = [](std::string haystack_str, StringView haystack_sw,
+                          std::string current_chars, size_t pos) {
+    EXPECT_EQ(haystack_str.find_last_not_of(current_chars, pos),
+              haystack_sw.find_last_not_of(current_chars, pos));
+  };
+
+  // Look for all chars combinations, and compare with string.
+  LoopOverCharCombinations(sw, sw, test_callback);
+
+  // Use another string for negative examples.
+  StringView other_sw("Fuchsia World");
+  LoopOverCharCombinations(sw, other_sw, test_callback);
+}
+
+}  // namespace
+}  // namespace fml
diff --git a/fml/task_runner.cc b/fml/task_runner.cc
index cb505d4f38c42178f7c6916959cd998c0e2c3699..c21e0fece549e9257f2af80e45ad8385a0b654c7 100644
--- a/fml/task_runner.cc
+++ b/fml/task_runner.cc
@@ -14,24 +14,24 @@
 
 namespace fml {
 
-TaskRunner::TaskRunner(fxl::RefPtr<MessageLoopImpl> loop)
+TaskRunner::TaskRunner(fml::RefPtr<MessageLoopImpl> loop)
     : loop_(std::move(loop)) {
   FML_CHECK(loop_);
 }
 
 TaskRunner::~TaskRunner() = default;
 
-void TaskRunner::PostTask(fxl::Closure task) {
-  loop_->PostTask(std::move(task), fxl::TimePoint::Now());
+void TaskRunner::PostTask(fml::closure task) {
+  loop_->PostTask(std::move(task), fml::TimePoint::Now());
 }
 
-void TaskRunner::PostTaskForTime(fxl::Closure task,
-                                 fxl::TimePoint target_time) {
+void TaskRunner::PostTaskForTime(fml::closure task,
+                                 fml::TimePoint target_time) {
   loop_->PostTask(std::move(task), target_time);
 }
 
-void TaskRunner::PostDelayedTask(fxl::Closure task, fxl::TimeDelta delay) {
-  loop_->PostTask(std::move(task), fxl::TimePoint::Now() + delay);
+void TaskRunner::PostDelayedTask(fml::closure task, fml::TimeDelta delay) {
+  loop_->PostTask(std::move(task), fml::TimePoint::Now() + delay);
 }
 
 bool TaskRunner::RunsTasksOnCurrentThread() {
@@ -41,8 +41,8 @@ bool TaskRunner::RunsTasksOnCurrentThread() {
   return MessageLoop::GetCurrent().GetLoopImpl() == loop_;
 }
 
-void TaskRunner::RunNowOrPostTask(fxl::RefPtr<fxl::TaskRunner> runner,
-                                  fxl::Closure task) {
+void TaskRunner::RunNowOrPostTask(fml::RefPtr<fml::TaskRunner> runner,
+                                  fml::closure task) {
   FML_DCHECK(runner);
   if (runner->RunsTasksOnCurrentThread()) {
     task();
diff --git a/fml/task_runner.h b/fml/task_runner.h
index b4304ddd2fb173a84b72044053778f6fdcdcc62c..4c77b9fe5a9e3727c9aa80d479cede09ffe7666c 100644
--- a/fml/task_runner.h
+++ b/fml/task_runner.h
@@ -5,36 +5,38 @@
 #ifndef FLUTTER_FML_TASK_RUNNER_H_
 #define FLUTTER_FML_TASK_RUNNER_H_
 
+#include "flutter/fml/closure.h"
 #include "flutter/fml/macros.h"
-#include "lib/fxl/memory/ref_counted.h"
-#include "lib/fxl/tasks/task_runner.h"
+#include "flutter/fml/memory/ref_counted.h"
+#include "flutter/fml/memory/ref_ptr.h"
+#include "flutter/fml/time/time_point.h"
 
 namespace fml {
 
 class MessageLoopImpl;
 
-class TaskRunner final : public fxl::TaskRunner {
+class TaskRunner : public fml::RefCountedThreadSafe<TaskRunner> {
  public:
-  void PostTask(fxl::Closure task) override;
+  void PostTask(fml::closure task);
 
-  void PostTaskForTime(fxl::Closure task, fxl::TimePoint target_time) override;
+  void PostTaskForTime(fml::closure task, fml::TimePoint target_time);
 
-  void PostDelayedTask(fxl::Closure task, fxl::TimeDelta delay) override;
+  void PostDelayedTask(fml::closure task, fml::TimeDelta delay);
 
-  bool RunsTasksOnCurrentThread() override;
+  bool RunsTasksOnCurrentThread();
 
-  static void RunNowOrPostTask(fxl::RefPtr<fxl::TaskRunner> runner,
-                               fxl::Closure task);
+  static void RunNowOrPostTask(fml::RefPtr<fml::TaskRunner> runner,
+                               fml::closure task);
 
  private:
-  fxl::RefPtr<MessageLoopImpl> loop_;
+  fml::RefPtr<MessageLoopImpl> loop_;
 
-  TaskRunner(fxl::RefPtr<MessageLoopImpl> loop);
+  TaskRunner(fml::RefPtr<MessageLoopImpl> loop);
 
-  ~TaskRunner() override;
+  ~TaskRunner();
 
-  FRIEND_MAKE_REF_COUNTED(TaskRunner);
-  FRIEND_REF_COUNTED_THREAD_SAFE(TaskRunner);
+  FML_FRIEND_MAKE_REF_COUNTED(TaskRunner);
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(TaskRunner);
   FML_DISALLOW_COPY_AND_ASSIGN(TaskRunner);
 };
 
diff --git a/fml/thread.cc b/fml/thread.cc
index 2f71c07ffcd13f75d24723858a09487a87da4219..5690d73d51f175117c74680e221cdad2bcf4b92b 100644
--- a/fml/thread.cc
+++ b/fml/thread.cc
@@ -24,7 +24,7 @@ namespace fml {
 
 Thread::Thread(const std::string& name) : joined_(false) {
   fml::AutoResetWaitableEvent latch;
-  fxl::RefPtr<fml::TaskRunner> runner;
+  fml::RefPtr<fml::TaskRunner> runner;
   thread_ = std::make_unique<std::thread>([&latch, &runner, name]() -> void {
     SetCurrentThreadName(name);
     fml::MessageLoop::EnsureInitializedForCurrentThread();
@@ -41,7 +41,7 @@ Thread::~Thread() {
   Join();
 }
 
-fxl::RefPtr<fml::TaskRunner> Thread::GetTaskRunner() const {
+fml::RefPtr<fml::TaskRunner> Thread::GetTaskRunner() const {
   return task_runner_;
 }
 
@@ -86,7 +86,7 @@ void Thread::SetCurrentThreadName(const std::string& name) {
   } __except (EXCEPTION_CONTINUE_EXECUTION) {
   }
 #else
-  FXL_DLOG(INFO) << "Could not set the thread name to '" << name
+  FML_DLOG(INFO) << "Could not set the thread name to '" << name
                  << "' on this platform.";
 #endif
 }
diff --git a/fml/thread.h b/fml/thread.h
index 494897413ef63024218463be0598cccde6e03a92..aced4bbebdb805656b6f3b208786691c8e7168bd 100644
--- a/fml/thread.h
+++ b/fml/thread.h
@@ -20,13 +20,13 @@ class Thread {
 
   ~Thread();
 
-  fxl::RefPtr<fml::TaskRunner> GetTaskRunner() const;
+  fml::RefPtr<fml::TaskRunner> GetTaskRunner() const;
 
   void Join();
 
  private:
   std::unique_ptr<std::thread> thread_;
-  fxl::RefPtr<fml::TaskRunner> task_runner_;
+  fml::RefPtr<fml::TaskRunner> task_runner_;
   std::atomic_bool joined_;
 
   static void SetCurrentThreadName(const std::string& name);
diff --git a/lib/io/BUILD.gn b/lib/io/BUILD.gn
index 21e654f209b9244cd293cb01bb171591017c201d..ad58d8f0cdcbafaddce1b8022f88051860c49825 100644
--- a/lib/io/BUILD.gn
+++ b/lib/io/BUILD.gn
@@ -11,15 +11,10 @@ source_set("io") {
   deps = [
     "//third_party/dart/runtime:dart_api",
     "//third_party/dart/runtime/bin:embedded_dart_io",
-    "//garnet/public/lib/fxl",
     "//third_party/tonic",
   ]
 
-  configs += [
-    "//third_party/dart/runtime:dart_config",
-  ]
+  configs += [ "//third_party/dart/runtime:dart_config" ]
 
-  public_configs = [
-    "$flutter_root:config",
-  ]
+  public_configs = [ "$flutter_root:config" ]
 }
diff --git a/lib/io/dart_io.h b/lib/io/dart_io.h
index b2bf89f85d792a834873cda2055084ee336a7582..73203cfdf1bdbc3977212b931bab46b473c699a5 100644
--- a/lib/io/dart_io.h
+++ b/lib/io/dart_io.h
@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include "lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 
 namespace blink {
 
@@ -17,7 +17,7 @@ class DartIO {
   static bool EntropySource(uint8_t* buffer, intptr_t length);
 
  private:
-  FXL_DISALLOW_IMPLICIT_CONSTRUCTORS(DartIO);
+  FML_DISALLOW_IMPLICIT_CONSTRUCTORS(DartIO);
 };
 
 }  // namespace blink
diff --git a/lib/ui/BUILD.gn b/lib/ui/BUILD.gn
index 3135bda390aeab664f6fc48c360cc6146c624b7f..8ee92a71dcfcaed9cabe6b4522b92fd78016a409 100644
--- a/lib/ui/BUILD.gn
+++ b/lib/ui/BUILD.gn
@@ -102,7 +102,6 @@ source_set("ui") {
     "$flutter_root/flow",
     "$flutter_root/fml",
     "$flutter_root/runtime:test_font",
-    "//garnet/public/lib/fxl",
     "//third_party/dart/runtime/bin:embedded_dart_io",
     "//third_party/rapidjson",
     "//third_party/skia",
diff --git a/lib/ui/compositing/scene.cc b/lib/ui/compositing/scene.cc
index 34ca9060d88d95f6bfb27a5d42269af4a08a204b..2863f5307ad40979e526a53fa86c092cb334996a 100644
--- a/lib/ui/compositing/scene.cc
+++ b/lib/ui/compositing/scene.cc
@@ -4,9 +4,9 @@
 
 #include "flutter/lib/ui/compositing/scene.h"
 
+#include "flutter/fml/make_copyable.h"
 #include "flutter/fml/trace_event.h"
 #include "flutter/lib/ui/painting/image.h"
-#include "lib/fxl/functional/make_copyable.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/tonic/converter/dart_converter.h"
@@ -26,11 +26,11 @@ IMPLEMENT_WRAPPERTYPEINFO(ui, Scene);
 
 DART_BIND_ALL(Scene, FOR_EACH_BINDING)
 
-fxl::RefPtr<Scene> Scene::create(std::unique_ptr<flow::Layer> rootLayer,
+fml::RefPtr<Scene> Scene::create(std::unique_ptr<flow::Layer> rootLayer,
                                  uint32_t rasterizerTracingThreshold,
                                  bool checkerboardRasterCacheImages,
                                  bool checkerboardOffscreenLayers) {
-  return fxl::MakeRefCounted<Scene>(
+  return fml::MakeRefCounted<Scene>(
       std::move(rootLayer), rasterizerTracingThreshold,
       checkerboardRasterCacheImages, checkerboardOffscreenLayers);
 }
@@ -132,7 +132,7 @@ Dart_Handle Scene::toImage(uint32_t width,
 
   // The picture has been prepared on the UI thread.
   dart_state->GetTaskRunners().GetIOTaskRunner()->PostTask(
-      fxl::MakeCopyable([picture = std::move(picture),                    //
+      fml::MakeCopyable([picture = std::move(picture),                    //
                          bounds_size,                                     //
                          resource_context = std::move(resource_context),  //
                          ui_task_runner = std::move(ui_task_runner),      //
@@ -147,7 +147,7 @@ Dart_Handle Scene::toImage(uint32_t width,
         // Send the image back to the UI thread for submission back to the
         // framework.
         ui_task_runner->PostTask(
-            fxl::MakeCopyable([image = std::move(image),                    //
+            fml::MakeCopyable([image = std::move(image),                    //
                                image_callback = std::move(image_callback),  //
                                unref_queue = std::move(unref_queue)         //
         ]() mutable {
diff --git a/lib/ui/compositing/scene.h b/lib/ui/compositing/scene.h
index fde6849936e2ff1faea9f434ddb770578e238043..09f6a3e0d833021e416cbf64cdc00e8f94b15623 100644
--- a/lib/ui/compositing/scene.h
+++ b/lib/ui/compositing/scene.h
@@ -20,11 +20,11 @@ namespace blink {
 
 class Scene : public RefCountedDartWrappable<Scene> {
   DEFINE_WRAPPERTYPEINFO();
-  FRIEND_MAKE_REF_COUNTED(Scene);
+  FML_FRIEND_MAKE_REF_COUNTED(Scene);
 
  public:
   ~Scene() override;
-  static fxl::RefPtr<Scene> create(std::unique_ptr<flow::Layer> rootLayer,
+  static fml::RefPtr<Scene> create(std::unique_ptr<flow::Layer> rootLayer,
                                    uint32_t rasterizerTracingThreshold,
                                    bool checkerboardRasterCacheImages,
                                    bool checkerboardOffscreenLayers);
diff --git a/lib/ui/compositing/scene_builder.cc b/lib/ui/compositing/scene_builder.cc
index 543b397597c642d12beff0e8db164cea19ddb4b7..2c0ade64b20fe800cf7c4f6d5ae304fd55dc9f02 100644
--- a/lib/ui/compositing/scene_builder.cc
+++ b/lib/ui/compositing/scene_builder.cc
@@ -4,11 +4,11 @@
 
 #include "flutter/lib/ui/compositing/scene_builder.h"
 
+#include "flutter/fml/build_config.h"
 #include "flutter/lib/ui/painting/matrix.h"
 #include "flutter/lib/ui/painting/shader.h"
 #include "flutter/lib/ui/ui_dart_state.h"
 #include "flutter/lib/ui/window/window.h"
-#include "lib/fxl/build_config.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_args.h"
@@ -178,8 +178,8 @@ void SceneBuilder::setCheckerboardOffscreenLayers(bool checkerboard) {
   layer_builder_->SetCheckerboardOffscreenLayers(checkerboard);
 }
 
-fxl::RefPtr<Scene> SceneBuilder::build() {
-  fxl::RefPtr<Scene> scene =
+fml::RefPtr<Scene> SceneBuilder::build() {
+  fml::RefPtr<Scene> scene =
       Scene::create(layer_builder_->TakeLayer(),
                     layer_builder_->GetRasterizerTracingThreshold(),
                     layer_builder_->GetCheckerboardRasterCacheImages(),
diff --git a/lib/ui/compositing/scene_builder.h b/lib/ui/compositing/scene_builder.h
index 081396425a43c47450e862824878b772e172aa41..5f17bf265c478e2d20568958b652cfaa414e828b 100644
--- a/lib/ui/compositing/scene_builder.h
+++ b/lib/ui/compositing/scene_builder.h
@@ -24,11 +24,11 @@ namespace blink {
 
 class SceneBuilder : public RefCountedDartWrappable<SceneBuilder> {
   DEFINE_WRAPPERTYPEINFO();
-  FRIEND_MAKE_REF_COUNTED(SceneBuilder);
+  FML_FRIEND_MAKE_REF_COUNTED(SceneBuilder);
 
  public:
-  static fxl::RefPtr<SceneBuilder> create() {
-    return fxl::MakeRefCounted<SceneBuilder>();
+  static fml::RefPtr<SceneBuilder> create() {
+    return fml::MakeRefCounted<SceneBuilder>();
   }
 
   ~SceneBuilder() override;
@@ -84,7 +84,7 @@ class SceneBuilder : public RefCountedDartWrappable<SceneBuilder> {
   void setCheckerboardRasterCacheImages(bool checkerboard);
   void setCheckerboardOffscreenLayers(bool checkerboard);
 
-  fxl::RefPtr<Scene> build();
+  fml::RefPtr<Scene> build();
 
   static void RegisterNatives(tonic::DartLibraryNatives* natives);
 
diff --git a/lib/ui/compositing/scene_host.cc b/lib/ui/compositing/scene_host.cc
index 3503dccd0e606a518887304016b9e34af702c45a..c9588eb8c504aafe92a5763dd65632d894d61f60 100644
--- a/lib/ui/compositing/scene_host.cc
+++ b/lib/ui/compositing/scene_host.cc
@@ -31,19 +31,19 @@ void SceneHost::RegisterNatives(tonic::DartLibraryNatives* natives) {
 }
 
 #if defined(OS_FUCHSIA)
-fxl::RefPtr<SceneHost> SceneHost::create(
-    fxl::RefPtr<zircon::dart::Handle> export_token_handle) {
-  return fxl::MakeRefCounted<SceneHost>(export_token_handle);
+fml::RefPtr<SceneHost> SceneHost::create(
+    fml::RefPtr<zircon::dart::Handle> export_token_handle) {
+  return fml::MakeRefCounted<SceneHost>(export_token_handle);
 }
 
-SceneHost::SceneHost(fxl::RefPtr<zircon::dart::Handle> export_token_handle) {
-  export_node_holder_ = fxl::MakeRefCounted<flow::ExportNodeHolder>(
+SceneHost::SceneHost(fml::RefPtr<zircon::dart::Handle> export_token_handle) {
+  export_node_holder_ = fml::MakeRefCounted<flow::ExportNodeHolder>(
       blink::UIDartState::Current()->GetTaskRunners().GetGPUTaskRunner(),
       export_token_handle);
 }
 #else
-fxl::RefPtr<SceneHost> SceneHost::create(Dart_Handle export_token_handle) {
-  return fxl::MakeRefCounted<SceneHost>(export_token_handle);
+fml::RefPtr<SceneHost> SceneHost::create(Dart_Handle export_token_handle) {
+  return fml::MakeRefCounted<SceneHost>(export_token_handle);
 }
 
 SceneHost::SceneHost(Dart_Handle export_token_handle) {}
diff --git a/lib/ui/compositing/scene_host.h b/lib/ui/compositing/scene_host.h
index e9e4068ce10d2af93b9bbc8771d2a0fa7f0d8322..171506358d09b5c2796b3804b7118c89a590ee0f 100644
--- a/lib/ui/compositing/scene_host.h
+++ b/lib/ui/compositing/scene_host.h
@@ -21,20 +21,20 @@ namespace blink {
 
 class SceneHost : public RefCountedDartWrappable<SceneHost> {
   DEFINE_WRAPPERTYPEINFO();
-  FRIEND_MAKE_REF_COUNTED(SceneHost);
+  FML_FRIEND_MAKE_REF_COUNTED(SceneHost);
 
  public:
 #if defined(OS_FUCHSIA)
-  static fxl::RefPtr<SceneHost> create(
-      fxl::RefPtr<zircon::dart::Handle> export_token_handle);
+  static fml::RefPtr<SceneHost> create(
+      fml::RefPtr<zircon::dart::Handle> export_token_handle);
 #else
-  static fxl::RefPtr<SceneHost> create(Dart_Handle export_token_handle);
+  static fml::RefPtr<SceneHost> create(Dart_Handle export_token_handle);
 #endif
 
   ~SceneHost() override;
 
 #if defined(OS_FUCHSIA)
-  const fxl::RefPtr<flow::ExportNodeHolder>& export_node_holder() const {
+  const fml::RefPtr<flow::ExportNodeHolder>& export_node_holder() const {
     return export_node_holder_;
   }
 #endif
@@ -45,11 +45,11 @@ class SceneHost : public RefCountedDartWrappable<SceneHost> {
 
  private:
 #if defined(OS_FUCHSIA)
-  fxl::RefPtr<flow::ExportNodeHolder> export_node_holder_;
+  fml::RefPtr<flow::ExportNodeHolder> export_node_holder_;
 #endif
 
 #if defined(OS_FUCHSIA)
-  explicit SceneHost(fxl::RefPtr<zircon::dart::Handle> export_token_handle);
+  explicit SceneHost(fml::RefPtr<zircon::dart::Handle> export_token_handle);
 #else
   explicit SceneHost(Dart_Handle export_token_handle);
 #endif
diff --git a/lib/ui/dart_runtime_hooks.cc b/lib/ui/dart_runtime_hooks.cc
index 187913df31846e98cd34856c215f0da48b895e1b..7c699fda3e73e6bb59f52b002542239461c454d3 100644
--- a/lib/ui/dart_runtime_hooks.cc
+++ b/lib/ui/dart_runtime_hooks.cc
@@ -12,10 +12,10 @@
 #include <sstream>
 
 #include "flutter/common/settings.h"
+#include "flutter/fml/build_config.h"
+#include "flutter/fml/logging.h"
 #include "flutter/lib/ui/plugins/callback_cache.h"
 #include "flutter/lib/ui/ui_dart_state.h"
-#include "lib/fxl/build_config.h"
-#include "lib/fxl/logging.h"
 #include "third_party/dart/runtime/bin/embedded_dart_io.h"
 #include "third_party/dart/runtime/include/dart_api.h"
 #include "third_party/dart/runtime/include/dart_tools_api.h"
diff --git a/lib/ui/dart_runtime_hooks.h b/lib/ui/dart_runtime_hooks.h
index b71d57beda2731a7ba1488c6312a5176a494607d..50247eec067348c01550c7bd2083124621d1523b 100644
--- a/lib/ui/dart_runtime_hooks.h
+++ b/lib/ui/dart_runtime_hooks.h
@@ -5,7 +5,7 @@
 #ifndef FLUTTER_LIB_UI_DART_RUNTIME_HOOKS_H_
 #define FLUTTER_LIB_UI_DART_RUNTIME_HOOKS_H_
 
-#include "lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 #include "third_party/dart/runtime/include/dart_api.h"
 #include "third_party/tonic/dart_library_natives.h"
 
@@ -17,7 +17,7 @@ class DartRuntimeHooks {
   static void RegisterNatives(tonic::DartLibraryNatives* natives);
 
  private:
-  FXL_DISALLOW_IMPLICIT_CONSTRUCTORS(DartRuntimeHooks);
+  FML_DISALLOW_IMPLICIT_CONSTRUCTORS(DartRuntimeHooks);
 };
 
 }  // namespace blink
diff --git a/lib/ui/dart_ui.cc b/lib/ui/dart_ui.cc
index 0bf84899ce1f317ed10206ff36feb5fc770b60d4..5fb48d436e99b33261875522f312d4a6614af11a 100644
--- a/lib/ui/dart_ui.cc
+++ b/lib/ui/dart_ui.cc
@@ -4,6 +4,7 @@
 
 #include "flutter/lib/ui/dart_ui.h"
 
+#include "flutter/fml/build_config.h"
 #include "flutter/lib/ui/compositing/scene.h"
 #include "flutter/lib/ui/compositing/scene_builder.h"
 #include "flutter/lib/ui/dart_runtime_hooks.h"
@@ -25,7 +26,6 @@
 #include "flutter/lib/ui/text/paragraph.h"
 #include "flutter/lib/ui/text/paragraph_builder.h"
 #include "flutter/lib/ui/window/window.h"
-#include "lib/fxl/build_config.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/logging/dart_error.h"
 
@@ -77,7 +77,7 @@ void DartUI::InitForGlobal() {
 }
 
 void DartUI::InitForIsolate() {
-  FXL_DCHECK(g_natives);
+  FML_DCHECK(g_natives);
   DART_CHECK_VALID(Dart_SetNativeResolver(Dart_LookupLibrary(ToDart("dart:ui")),
                                           GetNativeFunction, GetSymbol));
 }
diff --git a/lib/ui/dart_ui.h b/lib/ui/dart_ui.h
index 2846ec8c84a17e3f0a54aa33e4e996aa4d582938..4c00bda211a4491d4009a6a657a41fc323eabaac 100644
--- a/lib/ui/dart_ui.h
+++ b/lib/ui/dart_ui.h
@@ -5,7 +5,7 @@
 #ifndef FLUTTER_LIB_UI_DART_UI_H_
 #define FLUTTER_LIB_UI_DART_UI_H_
 
-#include "lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 
 namespace blink {
 
@@ -15,7 +15,7 @@ class DartUI {
   static void InitForIsolate();
 
  private:
-  FXL_DISALLOW_IMPLICIT_CONSTRUCTORS(DartUI);
+  FML_DISALLOW_IMPLICIT_CONSTRUCTORS(DartUI);
 };
 
 }  // namespace blink
diff --git a/lib/ui/dart_wrapper.h b/lib/ui/dart_wrapper.h
index fb30369e5155a41b4dc783e81bc2d10b231aae43..ae20bcfa68d71b39e7e790d5eeaaba476b76bd76 100644
--- a/lib/ui/dart_wrapper.h
+++ b/lib/ui/dart_wrapper.h
@@ -5,21 +5,21 @@
 #ifndef FLUTTER_LIB_UI_DART_WRAPPER_H_
 #define FLUTTER_LIB_UI_DART_WRAPPER_H_
 
-#include "lib/fxl/memory/ref_counted.h"
+#include "flutter/fml/memory/ref_counted.h"
 #include "third_party/tonic/dart_wrappable.h"
 
 namespace blink {
 
 template <typename T>
-class RefCountedDartWrappable : public fxl::RefCountedThreadSafe<T>,
+class RefCountedDartWrappable : public fml::RefCountedThreadSafe<T>,
                                 public tonic::DartWrappable {
  public:
   virtual void RetainDartWrappableReference() const override {
-    fxl::RefCountedThreadSafe<T>::AddRef();
+    fml::RefCountedThreadSafe<T>::AddRef();
   }
 
   virtual void ReleaseDartWrappableReference() const override {
-    fxl::RefCountedThreadSafe<T>::Release();
+    fml::RefCountedThreadSafe<T>::Release();
   }
 };
 
diff --git a/lib/ui/isolate_name_server/isolate_name_server.h b/lib/ui/isolate_name_server/isolate_name_server.h
index fe1ee7910e57cbe58e4918fc8ee8e3f27759336e..88c42687368191465b87a768631715def01cdd5c 100644
--- a/lib/ui/isolate_name_server/isolate_name_server.h
+++ b/lib/ui/isolate_name_server/isolate_name_server.h
@@ -9,8 +9,8 @@
 #include <mutex>
 #include <string>
 
+#include "flutter/fml/macros.h"
 #include "flutter/fml/synchronization/thread_annotations.h"
-#include "lib/fxl/macros.h"
 #include "third_party/dart/runtime/include/dart_api.h"
 
 #define LOCK_UNLOCK(m) FML_ACQUIRE(m) FML_RELEASE(m)
@@ -42,7 +42,7 @@ class IsolateNameServer {
   mutable std::mutex mutex_;
   std::map<std::string, Dart_Port> port_mapping_ FML_GUARDED_BY(mutex_);
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(IsolateNameServer);
+  FML_DISALLOW_COPY_AND_ASSIGN(IsolateNameServer);
 };
 
 }  // namespace blink
diff --git a/lib/ui/painting/canvas.cc b/lib/ui/painting/canvas.cc
index 6365897d7fe5615a912bff4e354debb805d29e75..a691b752d1652e288e3d832e8039edb6f1f9a432 100644
--- a/lib/ui/painting/canvas.cc
+++ b/lib/ui/painting/canvas.cc
@@ -70,7 +70,7 @@ void Canvas::RegisterNatives(tonic::DartLibraryNatives* natives) {
                      FOR_EACH_BINDING(DART_REGISTER_NATIVE)});
 }
 
-fxl::RefPtr<Canvas> Canvas::Create(PictureRecorder* recorder,
+fml::RefPtr<Canvas> Canvas::Create(PictureRecorder* recorder,
                                    double left,
                                    double top,
                                    double right,
@@ -78,8 +78,8 @@ fxl::RefPtr<Canvas> Canvas::Create(PictureRecorder* recorder,
   if (!recorder)
     Dart_ThrowException(
         ToDart("Canvas constructor called with non-genuine PictureRecorder."));
-  FXL_DCHECK(!recorder->isRecording());  // verified by Dart code
-  fxl::RefPtr<Canvas> canvas = fxl::MakeRefCounted<Canvas>(
+  FML_DCHECK(!recorder->isRecording());  // verified by Dart code
+  fml::RefPtr<Canvas> canvas = fml::MakeRefCounted<Canvas>(
       recorder->BeginRecording(SkRect::MakeLTRB(left, top, right, bottom)));
   recorder->set_canvas(canvas);
   return canvas;
diff --git a/lib/ui/painting/canvas.h b/lib/ui/painting/canvas.h
index 76ed5159bb9784282549901f4b8e9cdca55d2b97..c4c870d3171705b027b09e6671fa6699db4cf072 100644
--- a/lib/ui/painting/canvas.h
+++ b/lib/ui/painting/canvas.h
@@ -27,10 +27,10 @@ class CanvasImage;
 
 class Canvas : public RefCountedDartWrappable<Canvas> {
   DEFINE_WRAPPERTYPEINFO();
-  FRIEND_MAKE_REF_COUNTED(Canvas);
+  FML_FRIEND_MAKE_REF_COUNTED(Canvas);
 
  public:
-  static fxl::RefPtr<Canvas> Create(PictureRecorder* recorder,
+  static fml::RefPtr<Canvas> Create(PictureRecorder* recorder,
                                     double left,
                                     double top,
                                     double right,
diff --git a/lib/ui/painting/codec.cc b/lib/ui/painting/codec.cc
index 05de814f1fc0a29241284ee775ad423819a8a6e7..68233505536570388d87b85ee158703638b7de80 100644
--- a/lib/ui/painting/codec.cc
+++ b/lib/ui/painting/codec.cc
@@ -5,10 +5,10 @@
 #include "flutter/lib/ui/painting/codec.h"
 
 #include "flutter/common/task_runners.h"
+#include "flutter/fml/logging.h"
+#include "flutter/fml/make_copyable.h"
 #include "flutter/fml/trace_event.h"
 #include "flutter/lib/ui/painting/frame_info.h"
-#include "lib/fxl/functional/make_copyable.h"
-#include "lib/fxl/logging.h"
 #include "third_party/skia/include/codec/SkCodec.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
 #include "third_party/tonic/dart_binding_macros.h"
@@ -43,7 +43,7 @@ struct ImageInfo {
   size_t row_bytes;
 };
 
-static void InvokeCodecCallback(fxl::RefPtr<Codec> codec,
+static void InvokeCodecCallback(fml::RefPtr<Codec> codec,
                                 std::unique_ptr<DartPersistentValue> callback,
                                 size_t trace_id) {
   std::shared_ptr<tonic::DartState> dart_state = callback->dart_state().lock();
@@ -83,49 +83,49 @@ static sk_sp<SkImage> DecodeImage(fml::WeakPtr<GrContext> context,
   }
 }
 
-fxl::RefPtr<Codec> InitCodec(fml::WeakPtr<GrContext> context,
+fml::RefPtr<Codec> InitCodec(fml::WeakPtr<GrContext> context,
                              sk_sp<SkData> buffer,
-                             fxl::RefPtr<flow::SkiaUnrefQueue> unref_queue,
+                             fml::RefPtr<flow::SkiaUnrefQueue> unref_queue,
                              size_t trace_id) {
   TRACE_FLOW_STEP("flutter", kInitCodecTraceTag, trace_id);
   TRACE_EVENT0("blink", "InitCodec");
 
   if (buffer == nullptr || buffer->isEmpty()) {
-    FXL_LOG(ERROR) << "InitCodec failed - buffer was empty ";
+    FML_LOG(ERROR) << "InitCodec failed - buffer was empty ";
     return nullptr;
   }
 
   std::unique_ptr<SkCodec> skCodec = SkCodec::MakeFromData(buffer);
   if (!skCodec) {
-    FXL_LOG(ERROR) << "Failed decoding image. Data is either invalid, or it is "
+    FML_LOG(ERROR) << "Failed decoding image. Data is either invalid, or it is "
                       "encoded using an unsupported format.";
     return nullptr;
   }
   if (skCodec->getFrameCount() > 1) {
-    return fxl::MakeRefCounted<MultiFrameCodec>(std::move(skCodec));
+    return fml::MakeRefCounted<MultiFrameCodec>(std::move(skCodec));
   }
   auto skImage = DecodeImage(context, buffer, trace_id);
   if (!skImage) {
-    FXL_LOG(ERROR) << "DecodeImage failed";
+    FML_LOG(ERROR) << "DecodeImage failed";
     return nullptr;
   }
   auto image = CanvasImage::Create();
   image->set_image({skImage, unref_queue});
-  auto frameInfo = fxl::MakeRefCounted<FrameInfo>(std::move(image), 0);
-  return fxl::MakeRefCounted<SingleFrameCodec>(std::move(frameInfo));
+  auto frameInfo = fml::MakeRefCounted<FrameInfo>(std::move(image), 0);
+  return fml::MakeRefCounted<SingleFrameCodec>(std::move(frameInfo));
 }
 
-fxl::RefPtr<Codec> InitCodecUncompressed(
+fml::RefPtr<Codec> InitCodecUncompressed(
     fml::WeakPtr<GrContext> context,
     sk_sp<SkData> buffer,
     ImageInfo image_info,
-    fxl::RefPtr<flow::SkiaUnrefQueue> unref_queue,
+    fml::RefPtr<flow::SkiaUnrefQueue> unref_queue,
     size_t trace_id) {
   TRACE_FLOW_STEP("flutter", kInitCodecTraceTag, trace_id);
   TRACE_EVENT0("blink", "InitCodecUncompressed");
 
   if (buffer == nullptr || buffer->isEmpty()) {
-    FXL_LOG(ERROR) << "InitCodecUncompressed failed - buffer was empty";
+    FML_LOG(ERROR) << "InitCodecUncompressed failed - buffer was empty";
     return nullptr;
   }
 
@@ -141,19 +141,19 @@ fxl::RefPtr<Codec> InitCodecUncompressed(
 
   auto image = CanvasImage::Create();
   image->set_image({skImage, unref_queue});
-  auto frameInfo = fxl::MakeRefCounted<FrameInfo>(std::move(image), 0);
-  return fxl::MakeRefCounted<SingleFrameCodec>(std::move(frameInfo));
+  auto frameInfo = fml::MakeRefCounted<FrameInfo>(std::move(image), 0);
+  return fml::MakeRefCounted<SingleFrameCodec>(std::move(frameInfo));
 }
 
 void InitCodecAndInvokeCodecCallback(
-    fxl::RefPtr<fxl::TaskRunner> ui_task_runner,
+    fml::RefPtr<fml::TaskRunner> ui_task_runner,
     fml::WeakPtr<GrContext> context,
-    fxl::RefPtr<flow::SkiaUnrefQueue> unref_queue,
+    fml::RefPtr<flow::SkiaUnrefQueue> unref_queue,
     std::unique_ptr<DartPersistentValue> callback,
     sk_sp<SkData> buffer,
     std::unique_ptr<ImageInfo> image_info,
     size_t trace_id) {
-  fxl::RefPtr<Codec> codec;
+  fml::RefPtr<Codec> codec;
   if (image_info) {
     codec = InitCodecUncompressed(context, std::move(buffer), *image_info,
                                   std::move(unref_queue), trace_id);
@@ -162,7 +162,7 @@ void InitCodecAndInvokeCodecCallback(
         InitCodec(context, std::move(buffer), std::move(unref_queue), trace_id);
   }
   ui_task_runner->PostTask(
-      fxl::MakeCopyable([callback = std::move(callback),
+      fml::MakeCopyable([callback = std::move(callback),
                          codec = std::move(codec), trace_id]() mutable {
         InvokeCodecCallback(std::move(codec), std::move(callback), trace_id);
       }));
@@ -282,7 +282,7 @@ void InstantiateImageCodec(Dart_NativeArguments args) {
   auto dart_state = UIDartState::Current();
 
   const auto& task_runners = dart_state->GetTaskRunners();
-  task_runners.GetIOTaskRunner()->PostTask(fxl::MakeCopyable(
+  task_runners.GetIOTaskRunner()->PostTask(fml::MakeCopyable(
       [callback = std::make_unique<DartPersistentValue>(
            tonic::DartState::Current(), callback_handle),
        buffer = std::move(buffer), trace_id, image_info = std::move(image_info),
@@ -325,7 +325,7 @@ bool copy_to(SkBitmap* dst, SkColorType dstColorType, const SkBitmap& src) {
   return true;
 }
 
-void InvokeNextFrameCallback(fxl::RefPtr<FrameInfo> frameInfo,
+void InvokeNextFrameCallback(fml::RefPtr<FrameInfo> frameInfo,
                              std::unique_ptr<DartPersistentValue> callback,
                              size_t trace_id) {
   std::shared_ptr<tonic::DartState> dart_state = callback->dart_state().lock();
@@ -379,7 +379,7 @@ sk_sp<SkImage> MultiFrameCodec::GetNextFrameImage(
     if (requiredFrame != SkCodec::kNone) {
       if (requiredFrame < 0 ||
           static_cast<size_t>(requiredFrame) >= frameBitmaps_.size()) {
-        FXL_LOG(ERROR) << "Frame " << nextFrameIndex_ << " depends on frame "
+        FML_LOG(ERROR) << "Frame " << nextFrameIndex_ << " depends on frame "
                        << requiredFrame << " which out of range (0,"
                        << frameBitmaps_.size() << ").";
         return NULL;
@@ -394,7 +394,7 @@ sk_sp<SkImage> MultiFrameCodec::GetNextFrameImage(
 
     if (SkCodec::kSuccess != codec_->getPixels(info, bitmap.getPixels(),
                                                bitmap.rowBytes(), &options)) {
-      FXL_LOG(ERROR) << "Could not getPixels for frame " << nextFrameIndex_;
+      FML_LOG(ERROR) << "Could not getPixels for frame " << nextFrameIndex_;
       return NULL;
     }
   }
@@ -416,21 +416,21 @@ sk_sp<SkImage> MultiFrameCodec::GetNextFrameImage(
 
 void MultiFrameCodec::GetNextFrameAndInvokeCallback(
     std::unique_ptr<DartPersistentValue> callback,
-    fxl::RefPtr<fxl::TaskRunner> ui_task_runner,
+    fml::RefPtr<fml::TaskRunner> ui_task_runner,
     fml::WeakPtr<GrContext> resourceContext,
-    fxl::RefPtr<flow::SkiaUnrefQueue> unref_queue,
+    fml::RefPtr<flow::SkiaUnrefQueue> unref_queue,
     size_t trace_id) {
-  fxl::RefPtr<FrameInfo> frameInfo = NULL;
+  fml::RefPtr<FrameInfo> frameInfo = NULL;
   sk_sp<SkImage> skImage = GetNextFrameImage(resourceContext);
   if (skImage) {
-    fxl::RefPtr<CanvasImage> image = CanvasImage::Create();
+    fml::RefPtr<CanvasImage> image = CanvasImage::Create();
     image->set_image({skImage, std::move(unref_queue)});
-    frameInfo = fxl::MakeRefCounted<FrameInfo>(
+    frameInfo = fml::MakeRefCounted<FrameInfo>(
         std::move(image), frameInfos_[nextFrameIndex_].fDuration);
   }
   nextFrameIndex_ = (nextFrameIndex_ + 1) % frameInfos_.size();
 
-  ui_task_runner->PostTask(fxl::MakeCopyable(
+  ui_task_runner->PostTask(fml::MakeCopyable(
       [callback = std::move(callback), frameInfo, trace_id]() mutable {
         InvokeNextFrameCallback(frameInfo, std::move(callback), trace_id);
       }));
@@ -452,7 +452,7 @@ Dart_Handle MultiFrameCodec::getNextFrame(Dart_Handle callback_handle) {
 
   const auto& task_runners = dart_state->GetTaskRunners();
 
-  task_runners.GetIOTaskRunner()->PostTask(fxl::MakeCopyable(
+  task_runners.GetIOTaskRunner()->PostTask(fml::MakeCopyable(
       [callback = std::make_unique<DartPersistentValue>(
            tonic::DartState::Current(), callback_handle),
        this, trace_id, ui_task_runner = task_runners.GetUITaskRunner(),
diff --git a/lib/ui/painting/codec.h b/lib/ui/painting/codec.h
index 54fa44b6cdd6120ad7aca84b67c1f57cb62ff2b7..c66ee445f2ba4aa362abb299c7c96d840990850c 100644
--- a/lib/ui/painting/codec.h
+++ b/lib/ui/painting/codec.h
@@ -49,9 +49,9 @@ class MultiFrameCodec : public Codec {
 
   void GetNextFrameAndInvokeCallback(
       std::unique_ptr<DartPersistentValue> callback,
-      fxl::RefPtr<fxl::TaskRunner> ui_task_runner,
+      fml::RefPtr<fml::TaskRunner> ui_task_runner,
       fml::WeakPtr<GrContext> resourceContext,
-      fxl::RefPtr<flow::SkiaUnrefQueue> unref_queue,
+      fml::RefPtr<flow::SkiaUnrefQueue> unref_queue,
       size_t trace_id);
 
   const std::unique_ptr<SkCodec> codec_;
@@ -61,8 +61,8 @@ class MultiFrameCodec : public Codec {
   std::vector<SkCodec::FrameInfo> frameInfos_;
   std::vector<SkBitmap> frameBitmaps_;
 
-  FRIEND_MAKE_REF_COUNTED(MultiFrameCodec);
-  FRIEND_REF_COUNTED_THREAD_SAFE(MultiFrameCodec);
+  FML_FRIEND_MAKE_REF_COUNTED(MultiFrameCodec);
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(MultiFrameCodec);
 };
 
 class SingleFrameCodec : public Codec {
@@ -72,13 +72,13 @@ class SingleFrameCodec : public Codec {
   Dart_Handle getNextFrame(Dart_Handle args);
 
  private:
-  SingleFrameCodec(fxl::RefPtr<FrameInfo> frame) : frame_(std::move(frame)) {}
+  SingleFrameCodec(fml::RefPtr<FrameInfo> frame) : frame_(std::move(frame)) {}
   ~SingleFrameCodec() {}
 
-  fxl::RefPtr<FrameInfo> frame_;
+  fml::RefPtr<FrameInfo> frame_;
 
-  FRIEND_MAKE_REF_COUNTED(SingleFrameCodec);
-  FRIEND_REF_COUNTED_THREAD_SAFE(SingleFrameCodec);
+  FML_FRIEND_MAKE_REF_COUNTED(SingleFrameCodec);
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(SingleFrameCodec);
 };
 
 }  // namespace blink
diff --git a/lib/ui/painting/frame_info.h b/lib/ui/painting/frame_info.h
index a1c6f1abbc6dcb130e01456fb78ffb2f3701bf9b..462ab513e0683be8e83dd637a907a2aaef384e62 100644
--- a/lib/ui/painting/frame_info.h
+++ b/lib/ui/painting/frame_info.h
@@ -20,20 +20,20 @@ class FrameInfo final : public RefCountedDartWrappable<FrameInfo> {
 
  public:
   int durationMillis() { return durationMillis_; }
-  fxl::RefPtr<CanvasImage> image() { return image_; }
+  fml::RefPtr<CanvasImage> image() { return image_; }
 
   static void RegisterNatives(tonic::DartLibraryNatives* natives);
 
  private:
-  FrameInfo(fxl::RefPtr<CanvasImage> image, int durationMillis)
+  FrameInfo(fml::RefPtr<CanvasImage> image, int durationMillis)
       : image_(std::move(image)), durationMillis_(durationMillis) {}
   ~FrameInfo(){};
 
-  const fxl::RefPtr<CanvasImage> image_;
+  const fml::RefPtr<CanvasImage> image_;
   const int durationMillis_;
 
-  FRIEND_MAKE_REF_COUNTED(FrameInfo);
-  FRIEND_REF_COUNTED_THREAD_SAFE(FrameInfo);
+  FML_FRIEND_MAKE_REF_COUNTED(FrameInfo);
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(FrameInfo);
 };
 
 }  // namespace blink
diff --git a/lib/ui/painting/gradient.cc b/lib/ui/painting/gradient.cc
index 9ec6f06304da39bf8b63030f098d1f3362750467..25b6595f6bf5494a49e1401d978736447a9e56a7 100644
--- a/lib/ui/painting/gradient.cc
+++ b/lib/ui/painting/gradient.cc
@@ -35,16 +35,16 @@ void CanvasGradient::RegisterNatives(tonic::DartLibraryNatives* natives) {
                      FOR_EACH_BINDING(DART_REGISTER_NATIVE)});
 }
 
-fxl::RefPtr<CanvasGradient> CanvasGradient::Create() {
-  return fxl::MakeRefCounted<CanvasGradient>();
+fml::RefPtr<CanvasGradient> CanvasGradient::Create() {
+  return fml::MakeRefCounted<CanvasGradient>();
 }
 
 void CanvasGradient::initLinear(const tonic::Float32List& end_points,
                                 const tonic::Int32List& colors,
                                 const tonic::Float32List& color_stops,
                                 SkShader::TileMode tile_mode) {
-  FXL_DCHECK(end_points.num_elements() == 4);
-  FXL_DCHECK(colors.num_elements() == color_stops.num_elements() ||
+  FML_DCHECK(end_points.num_elements() == 4);
+  FML_DCHECK(colors.num_elements() == color_stops.num_elements() ||
              color_stops.data() == nullptr);
 
   static_assert(sizeof(SkPoint) == sizeof(float) * 2,
@@ -65,7 +65,7 @@ void CanvasGradient::initRadial(double center_x,
                                 const tonic::Float32List& color_stops,
                                 SkShader::TileMode tile_mode,
                                 const tonic::Float64List& matrix4) {
-  FXL_DCHECK(colors.num_elements() == color_stops.num_elements() ||
+  FML_DCHECK(colors.num_elements() == color_stops.num_elements() ||
              color_stops.data() == nullptr);
 
   static_assert(sizeof(SkColor) == sizeof(int32_t),
@@ -91,7 +91,7 @@ void CanvasGradient::initSweep(double center_x,
                                double start_angle,
                                double end_angle,
                                const tonic::Float64List& matrix4) {
-  FXL_DCHECK(colors.num_elements() == color_stops.num_elements() ||
+  FML_DCHECK(colors.num_elements() == color_stops.num_elements() ||
              color_stops.data() == nullptr);
 
   static_assert(sizeof(SkColor) == sizeof(int32_t),
@@ -120,7 +120,7 @@ void CanvasGradient::initTwoPointConical(double start_x,
                                          const tonic::Float32List& color_stops,
                                          SkShader::TileMode tile_mode,
                                          const tonic::Float64List& matrix4) {
-  FXL_DCHECK(colors.num_elements() == color_stops.num_elements() ||
+  FML_DCHECK(colors.num_elements() == color_stops.num_elements() ||
              color_stops.data() == nullptr);
 
   static_assert(sizeof(SkColor) == sizeof(int32_t),
diff --git a/lib/ui/painting/gradient.h b/lib/ui/painting/gradient.h
index ae695c8dda61010803099fd1fbf2d46f16c638df..33450c2583812e12b7dfbb11b738d21aa8e0628d 100644
--- a/lib/ui/painting/gradient.h
+++ b/lib/ui/painting/gradient.h
@@ -24,11 +24,11 @@ static_assert(SkShader::kTileModeCount >= 3, "Need to update tile mode enum");
 
 class CanvasGradient : public Shader {
   DEFINE_WRAPPERTYPEINFO();
-  FRIEND_MAKE_REF_COUNTED(CanvasGradient);
+  FML_FRIEND_MAKE_REF_COUNTED(CanvasGradient);
 
  public:
   ~CanvasGradient() override;
-  static fxl::RefPtr<CanvasGradient> Create();
+  static fml::RefPtr<CanvasGradient> Create();
 
   void initLinear(const tonic::Float32List& end_points,
                   const tonic::Int32List& colors,
diff --git a/lib/ui/painting/image.h b/lib/ui/painting/image.h
index 538c3af8986e602fa683aa2c32285d6a1ca57abe..44e5cf4edc7c9a2ac7bead4a0e2f2d712bf85e38 100644
--- a/lib/ui/painting/image.h
+++ b/lib/ui/painting/image.h
@@ -18,12 +18,12 @@ namespace blink {
 
 class CanvasImage final : public RefCountedDartWrappable<CanvasImage> {
   DEFINE_WRAPPERTYPEINFO();
-  FRIEND_MAKE_REF_COUNTED(CanvasImage);
+  FML_FRIEND_MAKE_REF_COUNTED(CanvasImage);
 
  public:
   ~CanvasImage() override;
-  static fxl::RefPtr<CanvasImage> Create() {
-    return fxl::MakeRefCounted<CanvasImage>();
+  static fml::RefPtr<CanvasImage> Create() {
+    return fml::MakeRefCounted<CanvasImage>();
   }
 
   int width() { return image_.get()->width(); }
diff --git a/lib/ui/painting/image_encoding.cc b/lib/ui/painting/image_encoding.cc
index 987da761a51dea793c48a112a28f8c11f86876d8..b689269cf492bb474b945a920260d71ba7c7acf3 100644
--- a/lib/ui/painting/image_encoding.cc
+++ b/lib/ui/painting/image_encoding.cc
@@ -8,11 +8,11 @@
 #include <utility>
 
 #include "flutter/common/task_runners.h"
+#include "flutter/fml/build_config.h"
+#include "flutter/fml/make_copyable.h"
 #include "flutter/fml/trace_event.h"
 #include "flutter/lib/ui/painting/image.h"
 #include "flutter/lib/ui/ui_dart_state.h"
-#include "lib/fxl/build_config.h"
-#include "lib/fxl/functional/make_copyable.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkEncodedImageFormat.h"
 #include "third_party/skia/include/core/SkImage.h"
@@ -83,7 +83,7 @@ sk_sp<SkImage> ConvertToRasterImageIfNecessary(sk_sp<SkImage> image,
       SkImageInfo::MakeN32Premul(image->dimensions()));
 
   if (surface == nullptr || surface->getCanvas() == nullptr) {
-    FXL_LOG(ERROR) << "Could not create a surface to copy the texture into.";
+    FML_LOG(ERROR) << "Could not create a surface to copy the texture into.";
     return nullptr;
   }
 
@@ -93,7 +93,7 @@ sk_sp<SkImage> ConvertToRasterImageIfNecessary(sk_sp<SkImage> image,
   auto snapshot = surface->makeImageSnapshot();
 
   if (snapshot == nullptr) {
-    FXL_LOG(ERROR) << "Could not snapshot image to encode.";
+    FML_LOG(ERROR) << "Could not snapshot image to encode.";
     return nullptr;
   }
 
@@ -102,12 +102,12 @@ sk_sp<SkImage> ConvertToRasterImageIfNecessary(sk_sp<SkImage> image,
 
 sk_sp<SkData> CopyImageByteData(sk_sp<SkImage> raster_image,
                                 SkColorType color_type) {
-  FXL_DCHECK(raster_image);
+  FML_DCHECK(raster_image);
 
   SkPixmap pixmap;
 
   if (!raster_image->peekPixels(&pixmap)) {
-    FXL_LOG(ERROR) << "Could not copy pixels from the raster image.";
+    FML_LOG(ERROR) << "Could not copy pixels from the raster image.";
     return nullptr;
   }
 
@@ -122,14 +122,14 @@ sk_sp<SkData> CopyImageByteData(sk_sp<SkImage> raster_image,
                         color_type, kPremul_SkAlphaType, nullptr));
 
   if (!surface) {
-    FXL_LOG(ERROR) << "Could not setup the surface for swizzle.";
+    FML_LOG(ERROR) << "Could not setup the surface for swizzle.";
     return nullptr;
   }
 
   surface->writePixels(pixmap, 0, 0);
 
   if (!surface->peekPixels(&pixmap)) {
-    FXL_LOG(ERROR) << "Pixel address is not available.";
+    FML_LOG(ERROR) << "Pixel address is not available.";
     return nullptr;
   }
 
@@ -143,21 +143,21 @@ sk_sp<SkData> EncodeImage(sk_sp<SkImage> p_image,
 
   // Check validity of the image.
   if (p_image == nullptr) {
-    FXL_LOG(ERROR) << "Image was null.";
+    FML_LOG(ERROR) << "Image was null.";
     return nullptr;
   }
 
   auto dimensions = p_image->dimensions();
 
   if (dimensions.isEmpty()) {
-    FXL_LOG(ERROR) << "Image dimensions were empty.";
+    FML_LOG(ERROR) << "Image dimensions were empty.";
     return nullptr;
   }
 
   auto raster_image = ConvertToRasterImageIfNecessary(p_image, context);
 
   if (raster_image == nullptr) {
-    FXL_LOG(ERROR) << "Could not create a raster copy of the image.";
+    FML_LOG(ERROR) << "Could not create a raster copy of the image.";
     return nullptr;
   }
 
@@ -167,7 +167,7 @@ sk_sp<SkData> EncodeImage(sk_sp<SkImage> p_image,
           raster_image->encodeToData(SkEncodedImageFormat::kPNG, 0);
 
       if (png_image == nullptr) {
-        FXL_LOG(ERROR) << "Could not convert raster image to PNG.";
+        FML_LOG(ERROR) << "Could not convert raster image to PNG.";
         return nullptr;
       }
       return png_image;
@@ -180,7 +180,7 @@ sk_sp<SkData> EncodeImage(sk_sp<SkImage> p_image,
     } break;
   }
 
-  FXL_LOG(ERROR) << "Unknown error encoding image.";
+  FML_LOG(ERROR) << "Unknown error encoding image.";
   return nullptr;
 }
 
@@ -188,12 +188,12 @@ void EncodeImageAndInvokeDataCallback(
     std::unique_ptr<DartPersistentValue> callback,
     sk_sp<SkImage> image,
     GrContext* context,
-    fxl::RefPtr<fxl::TaskRunner> ui_task_runner,
+    fml::RefPtr<fml::TaskRunner> ui_task_runner,
     ImageByteFormat format) {
   sk_sp<SkData> encoded = EncodeImage(std::move(image), context, format);
 
   ui_task_runner->PostTask(
-      fxl::MakeCopyable([callback = std::move(callback), encoded]() mutable {
+      fml::MakeCopyable([callback = std::move(callback), encoded]() mutable {
         InvokeDataCallback(std::move(callback), std::move(encoded));
       }));
 }
@@ -218,7 +218,7 @@ Dart_Handle EncodeImage(CanvasImage* canvas_image,
   auto context = UIDartState::Current()->GetResourceContext();
 
   task_runners.GetIOTaskRunner()->PostTask(
-      fxl::MakeCopyable([callback = std::move(callback),                   //
+      fml::MakeCopyable([callback = std::move(callback),                   //
                          image = canvas_image->image(),                    //
                          context = std::move(context),                     //
                          ui_task_runner = task_runners.GetUITaskRunner(),  //
diff --git a/lib/ui/painting/image_filter.cc b/lib/ui/painting/image_filter.cc
index 77cfeada868859e021f296acee09f54699606c97..85735060b6bda12e2667d5c855f758cdbf8c24ce 100644
--- a/lib/ui/painting/image_filter.cc
+++ b/lib/ui/painting/image_filter.cc
@@ -35,8 +35,8 @@ void ImageFilter::RegisterNatives(tonic::DartLibraryNatives* natives) {
        FOR_EACH_BINDING(DART_REGISTER_NATIVE)});
 }
 
-fxl::RefPtr<ImageFilter> ImageFilter::Create() {
-  return fxl::MakeRefCounted<ImageFilter>();
+fml::RefPtr<ImageFilter> ImageFilter::Create() {
+  return fml::MakeRefCounted<ImageFilter>();
 }
 
 ImageFilter::ImageFilter() {}
diff --git a/lib/ui/painting/image_filter.h b/lib/ui/painting/image_filter.h
index 95d53ac85f0e8b3913362cc15185df18190a3e0a..bd5d2bfb99ae768a1be149f7f921f2607a6b555a 100644
--- a/lib/ui/painting/image_filter.h
+++ b/lib/ui/painting/image_filter.h
@@ -15,11 +15,11 @@ namespace blink {
 
 class ImageFilter : public RefCountedDartWrappable<ImageFilter> {
   DEFINE_WRAPPERTYPEINFO();
-  FRIEND_MAKE_REF_COUNTED(ImageFilter);
+  FML_FRIEND_MAKE_REF_COUNTED(ImageFilter);
 
  public:
   ~ImageFilter() override;
-  static fxl::RefPtr<ImageFilter> Create();
+  static fml::RefPtr<ImageFilter> Create();
 
   void initImage(CanvasImage* image);
   void initPicture(Picture*);
diff --git a/lib/ui/painting/image_shader.cc b/lib/ui/painting/image_shader.cc
index 0094f565c9ceabda0a6f1e3e1e464036edba1a52..e233c633c16bdaae06db09fc11bf69e0d3ca1898 100644
--- a/lib/ui/painting/image_shader.cc
+++ b/lib/ui/painting/image_shader.cc
@@ -30,8 +30,8 @@ void ImageShader::RegisterNatives(tonic::DartLibraryNatives* natives) {
        FOR_EACH_BINDING(DART_REGISTER_NATIVE)});
 }
 
-fxl::RefPtr<ImageShader> ImageShader::Create() {
-  return fxl::MakeRefCounted<ImageShader>();
+fml::RefPtr<ImageShader> ImageShader::Create() {
+  return fml::MakeRefCounted<ImageShader>();
 }
 
 void ImageShader::initWithImage(CanvasImage* image,
diff --git a/lib/ui/painting/image_shader.h b/lib/ui/painting/image_shader.h
index 6e031aebea3df9247c9429ee8dcf28700ca51d1d..17a5795e0255827179fda9b1f824316a651a4282 100644
--- a/lib/ui/painting/image_shader.h
+++ b/lib/ui/painting/image_shader.h
@@ -22,11 +22,11 @@ namespace blink {
 
 class ImageShader : public Shader {
   DEFINE_WRAPPERTYPEINFO();
-  FRIEND_MAKE_REF_COUNTED(ImageShader);
+  FML_FRIEND_MAKE_REF_COUNTED(ImageShader);
 
  public:
   ~ImageShader() override;
-  static fxl::RefPtr<ImageShader> Create();
+  static fml::RefPtr<ImageShader> Create();
 
   void initWithImage(CanvasImage* image,
                      SkShader::TileMode tmx,
diff --git a/lib/ui/painting/matrix.cc b/lib/ui/painting/matrix.cc
index dbf2df57049986c7af4fa9e6760909b930633b77..81c2f293b2f3d8d17372036faa5f37ffe6360274 100644
--- a/lib/ui/painting/matrix.cc
+++ b/lib/ui/painting/matrix.cc
@@ -4,7 +4,7 @@
 
 #include "flutter/lib/ui/painting/matrix.h"
 
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 
 namespace blink {
 
@@ -18,7 +18,7 @@ static const int kSkMatrixIndexToMatrix4Index[] = {
 };
 
 SkMatrix ToSkMatrix(const tonic::Float64List& matrix4) {
-  FXL_DCHECK(matrix4.data());
+  FML_DCHECK(matrix4.data());
   SkMatrix sk_matrix;
   for (int i = 0; i < 9; ++i) {
     int matrix4_index = kSkMatrixIndexToMatrix4Index[i];
diff --git a/lib/ui/painting/paint.cc b/lib/ui/painting/paint.cc
index 1c04f9781e9dad622aee4c95d39567f091aea1c9..00631451549eea474fec6aa44b4a0af9ca8e5d3e 100644
--- a/lib/ui/painting/paint.cc
+++ b/lib/ui/painting/paint.cc
@@ -4,8 +4,8 @@
 
 #include "flutter/lib/ui/painting/paint.h"
 
+#include "flutter/fml/logging.h"
 #include "flutter/lib/ui/painting/shader.h"
-#include "lib/fxl/logging.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkMaskFilter.h"
 #include "third_party/skia/include/core/SkShader.h"
@@ -56,11 +56,11 @@ Paint::Paint(Dart_Handle paint_objects, Dart_Handle paint_data) {
     return;
 
   if (!Dart_IsNull(paint_objects)) {
-    FXL_DCHECK(Dart_IsList(paint_objects));
+    FML_DCHECK(Dart_IsList(paint_objects));
     intptr_t length = 0;
     Dart_ListLength(paint_objects, &length);
 
-    FXL_CHECK(length == kObjectCount);
+    FML_CHECK(length == kObjectCount);
     Dart_Handle values[kObjectCount];
     if (Dart_IsError(Dart_ListGetRange(paint_objects, 0, kObjectCount, values)))
       return;
@@ -73,7 +73,7 @@ Paint::Paint(Dart_Handle paint_objects, Dart_Handle paint_data) {
   }
 
   tonic::DartByteData byte_data(paint_data);
-  FXL_CHECK(byte_data.length_in_bytes() == kDataByteCount);
+  FML_CHECK(byte_data.length_in_bytes() == kDataByteCount);
 
   const uint32_t* uint_data = static_cast<const uint32_t*>(byte_data.data());
   const float* float_data = static_cast<const float*>(byte_data.data());
@@ -144,10 +144,10 @@ blink::Paint DartConverter<blink::Paint>::FromArguments(
     int index,
     Dart_Handle& exception) {
   Dart_Handle paint_objects = Dart_GetNativeArgument(args, index);
-  FXL_DCHECK(!LogIfError(paint_objects));
+  FML_DCHECK(!LogIfError(paint_objects));
 
   Dart_Handle paint_data = Dart_GetNativeArgument(args, index + 1);
-  FXL_DCHECK(!LogIfError(paint_data));
+  FML_DCHECK(!LogIfError(paint_data));
 
   return blink::Paint(paint_objects, paint_data);
 }
diff --git a/lib/ui/painting/path.cc b/lib/ui/painting/path.cc
index a67ee9d2e306101329c7ae275538ed04bd5e6d31..2066fbe929cfa3ea98a6b95a0ab5ed9b4d0dce51 100644
--- a/lib/ui/painting/path.cc
+++ b/lib/ui/painting/path.cc
@@ -264,14 +264,14 @@ bool CanvasPath::contains(double x, double y) {
   return path_.contains(x, y);
 }
 
-fxl::RefPtr<CanvasPath> CanvasPath::shift(double dx, double dy) {
-  fxl::RefPtr<CanvasPath> path = CanvasPath::Create();
+fml::RefPtr<CanvasPath> CanvasPath::shift(double dx, double dy) {
+  fml::RefPtr<CanvasPath> path = CanvasPath::Create();
   path_.offset(dx, dy, &path->path_);
   return path;
 }
 
-fxl::RefPtr<CanvasPath> CanvasPath::transform(tonic::Float64List& matrix4) {
-  fxl::RefPtr<CanvasPath> path = CanvasPath::Create();
+fml::RefPtr<CanvasPath> CanvasPath::transform(tonic::Float64List& matrix4) {
+  fml::RefPtr<CanvasPath> path = CanvasPath::Create();
   path_.transform(ToSkMatrix(matrix4), &path->path_);
   matrix4.Release();
   return path;
@@ -291,8 +291,8 @@ bool CanvasPath::op(CanvasPath* path1, CanvasPath* path2, int operation) {
   return Op(path1->path(), path2->path(), (SkPathOp)operation, &path_);
 }
 
-fxl::RefPtr<CanvasPath> CanvasPath::clone() {
-  fxl::RefPtr<CanvasPath> path = CanvasPath::Create();
+fml::RefPtr<CanvasPath> CanvasPath::clone() {
+  fml::RefPtr<CanvasPath> path = CanvasPath::Create();
   // per Skia docs, this will create a fast copy
   // data is shared until the source path or dest path are mutated
   path->path_ = path_;
diff --git a/lib/ui/painting/path.h b/lib/ui/painting/path.h
index c52d98cded0b2d162fd78043b9a191ca0ca616f7..995cf1351262b893f92ee6c51cf4cf20819e8eeb 100644
--- a/lib/ui/painting/path.h
+++ b/lib/ui/painting/path.h
@@ -20,16 +20,16 @@ namespace blink {
 
 class CanvasPath : public RefCountedDartWrappable<CanvasPath> {
   DEFINE_WRAPPERTYPEINFO();
-  FRIEND_MAKE_REF_COUNTED(CanvasPath);
+  FML_FRIEND_MAKE_REF_COUNTED(CanvasPath);
 
  public:
   ~CanvasPath() override;
-  static fxl::RefPtr<CanvasPath> Create() {
-    return fxl::MakeRefCounted<CanvasPath>();
+  static fml::RefPtr<CanvasPath> Create() {
+    return fml::MakeRefCounted<CanvasPath>();
   }
 
-  static fxl::RefPtr<CanvasPath> CreateFrom(const SkPath& src) {
-    fxl::RefPtr<CanvasPath> path = CanvasPath::Create();
+  static fml::RefPtr<CanvasPath> CreateFrom(const SkPath& src) {
+    fml::RefPtr<CanvasPath> path = CanvasPath::Create();
     path->path_ = src;
     return path;
   }
@@ -96,11 +96,11 @@ class CanvasPath : public RefCountedDartWrappable<CanvasPath> {
   void close();
   void reset();
   bool contains(double x, double y);
-  fxl::RefPtr<CanvasPath> shift(double dx, double dy);
-  fxl::RefPtr<CanvasPath> transform(tonic::Float64List& matrix4);
+  fml::RefPtr<CanvasPath> shift(double dx, double dy);
+  fml::RefPtr<CanvasPath> transform(tonic::Float64List& matrix4);
   tonic::Float32List getBounds();
   bool op(CanvasPath* path1, CanvasPath* path2, int operation);
-  fxl::RefPtr<CanvasPath> clone();
+  fml::RefPtr<CanvasPath> clone();
 
   const SkPath& path() const { return path_; }
 
diff --git a/lib/ui/painting/path_measure.cc b/lib/ui/painting/path_measure.cc
index 17922325d1686306c6084fd50c30209a5573e673..8533e5627b721c9c1a8886353410e0da44210b4b 100644
--- a/lib/ui/painting/path_measure.cc
+++ b/lib/ui/painting/path_measure.cc
@@ -41,10 +41,10 @@ void CanvasPathMeasure::RegisterNatives(tonic::DartLibraryNatives* natives) {
        FOR_EACH_BINDING(DART_REGISTER_NATIVE)});
 }
 
-fxl::RefPtr<CanvasPathMeasure> CanvasPathMeasure::Create(const CanvasPath* path,
+fml::RefPtr<CanvasPathMeasure> CanvasPathMeasure::Create(const CanvasPath* path,
                                                          bool forceClosed) {
-  fxl::RefPtr<CanvasPathMeasure> pathMeasure =
-      fxl::MakeRefCounted<CanvasPathMeasure>();
+  fml::RefPtr<CanvasPathMeasure> pathMeasure =
+      fml::MakeRefCounted<CanvasPathMeasure>();
   if (path) {
     const SkPath skPath = path->path();
     SkScalar resScale = 1;
@@ -88,7 +88,7 @@ tonic::Float32List CanvasPathMeasure::getPosTan(float distance) {
   return posTan;
 }
 
-fxl::RefPtr<CanvasPath> CanvasPathMeasure::getSegment(float startD,
+fml::RefPtr<CanvasPath> CanvasPathMeasure::getSegment(float startD,
                                                       float stopD,
                                                       bool startWithMoveTo) {
   SkPath dst;
diff --git a/lib/ui/painting/path_measure.h b/lib/ui/painting/path_measure.h
index db8ef6b3e3d08bfff7c0863cb3c7ef6e38e76a16..ad21f4d358371b7a79c4addb706729b37ff2be9b 100644
--- a/lib/ui/painting/path_measure.h
+++ b/lib/ui/painting/path_measure.h
@@ -22,17 +22,17 @@ namespace blink {
 
 class CanvasPathMeasure : public RefCountedDartWrappable<CanvasPathMeasure> {
   DEFINE_WRAPPERTYPEINFO();
-  FRIEND_MAKE_REF_COUNTED(CanvasPathMeasure);
+  FML_FRIEND_MAKE_REF_COUNTED(CanvasPathMeasure);
 
  public:
   ~CanvasPathMeasure() override;
-  static fxl::RefPtr<CanvasPathMeasure> Create(const CanvasPath* path,
+  static fml::RefPtr<CanvasPathMeasure> Create(const CanvasPath* path,
                                                bool forceClosed);
 
   void setPath(const CanvasPath* path, bool isClosed);
   float getLength();
   tonic::Float32List getPosTan(float distance);
-  fxl::RefPtr<CanvasPath> getSegment(float startD,
+  fml::RefPtr<CanvasPath> getSegment(float startD,
                                      float stopD,
                                      bool startWithMoveTo);
   bool isClosed();
diff --git a/lib/ui/painting/picture.cc b/lib/ui/painting/picture.cc
index 096164de350e992fa160dd77d3415181f0445179..cbadebfc0a81813fa68c222e501bcc042382a8d1 100644
--- a/lib/ui/painting/picture.cc
+++ b/lib/ui/painting/picture.cc
@@ -23,8 +23,8 @@ IMPLEMENT_WRAPPERTYPEINFO(ui, Picture);
 
 DART_BIND_ALL(Picture, FOR_EACH_BINDING)
 
-fxl::RefPtr<Picture> Picture::Create(flow::SkiaGPUObject<SkPicture> picture) {
-  return fxl::MakeRefCounted<Picture>(std::move(picture));
+fml::RefPtr<Picture> Picture::Create(flow::SkiaGPUObject<SkPicture> picture) {
+  return fml::MakeRefCounted<Picture>(std::move(picture));
 }
 
 Picture::Picture(flow::SkiaGPUObject<SkPicture> picture)
@@ -32,8 +32,8 @@ Picture::Picture(flow::SkiaGPUObject<SkPicture> picture)
 
 Picture::~Picture() = default;
 
-fxl::RefPtr<CanvasImage> Picture::toImage(int width, int height) {
-  fxl::RefPtr<CanvasImage> image = CanvasImage::Create();
+fml::RefPtr<CanvasImage> Picture::toImage(int width, int height) {
+  fml::RefPtr<CanvasImage> image = CanvasImage::Create();
   image->set_image(UIDartState::CreateGPUObject(SkImage::MakeFromPicture(
       picture_.get(), SkISize::Make(width, height), nullptr, nullptr,
       SkImage::BitDepth::kU8, SkColorSpace::MakeSRGB())));
diff --git a/lib/ui/painting/picture.h b/lib/ui/painting/picture.h
index 1578fab7429bedcf5c1efe5921af5a07a5174422..01e7ecd596a7f052cb9c3a16bbc084a84b147bca 100644
--- a/lib/ui/painting/picture.h
+++ b/lib/ui/painting/picture.h
@@ -19,15 +19,15 @@ class Canvas;
 
 class Picture : public RefCountedDartWrappable<Picture> {
   DEFINE_WRAPPERTYPEINFO();
-  FRIEND_MAKE_REF_COUNTED(Picture);
+  FML_FRIEND_MAKE_REF_COUNTED(Picture);
 
  public:
   ~Picture() override;
-  static fxl::RefPtr<Picture> Create(flow::SkiaGPUObject<SkPicture> picture);
+  static fml::RefPtr<Picture> Create(flow::SkiaGPUObject<SkPicture> picture);
 
   sk_sp<SkPicture> picture() const { return picture_.get(); }
 
-  fxl::RefPtr<CanvasImage> toImage(int width, int height);
+  fml::RefPtr<CanvasImage> toImage(int width, int height);
 
   void dispose();
 
diff --git a/lib/ui/painting/picture_recorder.cc b/lib/ui/painting/picture_recorder.cc
index af3fe130e840157d29f1b0f090962bf908d51dec..9896f2f117a30bf4c23ea109af0ffbea546821ba 100644
--- a/lib/ui/painting/picture_recorder.cc
+++ b/lib/ui/painting/picture_recorder.cc
@@ -31,8 +31,8 @@ void PictureRecorder::RegisterNatives(tonic::DartLibraryNatives* natives) {
        FOR_EACH_BINDING(DART_REGISTER_NATIVE)});
 }
 
-fxl::RefPtr<PictureRecorder> PictureRecorder::Create() {
-  return fxl::MakeRefCounted<PictureRecorder>();
+fml::RefPtr<PictureRecorder> PictureRecorder::Create() {
+  return fml::MakeRefCounted<PictureRecorder>();
 }
 
 PictureRecorder::PictureRecorder() {}
@@ -47,11 +47,11 @@ SkCanvas* PictureRecorder::BeginRecording(SkRect bounds) {
   return picture_recorder_.beginRecording(bounds, &rtree_factory_);
 }
 
-fxl::RefPtr<Picture> PictureRecorder::endRecording() {
+fml::RefPtr<Picture> PictureRecorder::endRecording() {
   if (!isRecording())
     return nullptr;
 
-  fxl::RefPtr<Picture> picture = Picture::Create(UIDartState::CreateGPUObject(
+  fml::RefPtr<Picture> picture = Picture::Create(UIDartState::CreateGPUObject(
       picture_recorder_.finishRecordingAsPicture()));
   canvas_->Clear();
   canvas_->ClearDartWrapper();
diff --git a/lib/ui/painting/picture_recorder.h b/lib/ui/painting/picture_recorder.h
index 328fdefd916bd8b05cdfe7c4b1bfd38668e9b300..4e5cd861ce97bb7cc7cbef87d93d485db88022e4 100644
--- a/lib/ui/painting/picture_recorder.h
+++ b/lib/ui/painting/picture_recorder.h
@@ -18,18 +18,18 @@ class Picture;
 
 class PictureRecorder : public RefCountedDartWrappable<PictureRecorder> {
   DEFINE_WRAPPERTYPEINFO();
-  FRIEND_MAKE_REF_COUNTED(PictureRecorder);
+  FML_FRIEND_MAKE_REF_COUNTED(PictureRecorder);
 
  public:
-  static fxl::RefPtr<PictureRecorder> Create();
+  static fml::RefPtr<PictureRecorder> Create();
 
   ~PictureRecorder();
 
   SkCanvas* BeginRecording(SkRect bounds);
-  fxl::RefPtr<Picture> endRecording();
+  fml::RefPtr<Picture> endRecording();
   bool isRecording();
 
-  void set_canvas(fxl::RefPtr<Canvas> canvas) { canvas_ = std::move(canvas); }
+  void set_canvas(fml::RefPtr<Canvas> canvas) { canvas_ = std::move(canvas); }
 
   static void RegisterNatives(tonic::DartLibraryNatives* natives);
 
@@ -38,7 +38,7 @@ class PictureRecorder : public RefCountedDartWrappable<PictureRecorder> {
 
   SkRTreeFactory rtree_factory_;
   SkPictureRecorder picture_recorder_;
-  fxl::RefPtr<Canvas> canvas_;
+  fml::RefPtr<Canvas> canvas_;
 };
 
 }  // namespace blink
diff --git a/lib/ui/painting/rrect.cc b/lib/ui/painting/rrect.cc
index ad2d0da5e66f351c3aa12e12e37a55230183cec9..1436b95888df1fe1d694c8c763d8d340a28ef957 100644
--- a/lib/ui/painting/rrect.cc
+++ b/lib/ui/painting/rrect.cc
@@ -4,7 +4,7 @@
 
 #include "flutter/lib/ui/painting/rrect.h"
 
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 #include "third_party/tonic/logging/dart_error.h"
 #include "third_party/tonic/typed_data/float32_list.h"
 
@@ -39,7 +39,7 @@ RRect DartConverter<RRect>::FromArguments(Dart_NativeArguments args,
                                           int index,
                                           Dart_Handle& exception) {
   Dart_Handle value = Dart_GetNativeArgument(args, index);
-  FXL_DCHECK(!LogIfError(value));
+  FML_DCHECK(!LogIfError(value));
   return FromDart(value);
 }
 
diff --git a/lib/ui/painting/shader.h b/lib/ui/painting/shader.h
index 8b1cdb2469581b625e506218f904f4f336f68193..5fa0ce33c1d15ca6f4830f476577b90fcdf1cb8f 100644
--- a/lib/ui/painting/shader.h
+++ b/lib/ui/painting/shader.h
@@ -14,7 +14,7 @@ namespace blink {
 
 class Shader : public RefCountedDartWrappable<Shader> {
   DEFINE_WRAPPERTYPEINFO();
-  FRIEND_MAKE_REF_COUNTED(Shader);
+  FML_FRIEND_MAKE_REF_COUNTED(Shader);
 
  public:
   ~Shader() override;
diff --git a/lib/ui/painting/vertices.cc b/lib/ui/painting/vertices.cc
index 542451fb8de9ee316775ac75fd6117f1e0e57d7c..6fc519cd777e24f08cb5567d34334c5d1b846bb5 100644
--- a/lib/ui/painting/vertices.cc
+++ b/lib/ui/painting/vertices.cc
@@ -43,8 +43,8 @@ void Vertices::RegisterNatives(tonic::DartLibraryNatives* natives) {
                      FOR_EACH_BINDING(DART_REGISTER_NATIVE)});
 }
 
-fxl::RefPtr<Vertices> Vertices::Create() {
-  return fxl::MakeRefCounted<Vertices>();
+fml::RefPtr<Vertices> Vertices::Create() {
+  return fml::MakeRefCounted<Vertices>();
 }
 
 void Vertices::init(SkVertices::VertexMode vertex_mode,
@@ -62,18 +62,18 @@ void Vertices::init(SkVertices::VertexMode vertex_mode,
                               indices.num_elements(), builderFlags);
 
   // positions are required for SkVertices::Builder
-  FXL_DCHECK(positions.data());
+  FML_DCHECK(positions.data());
   if (positions.data())
     DecodePoints(positions, builder.positions());
 
   if (texture_coordinates.data()) {
     // SkVertices::Builder assumes equal numbers of elements
-    FXL_DCHECK(positions.num_elements() == texture_coordinates.num_elements());
+    FML_DCHECK(positions.num_elements() == texture_coordinates.num_elements());
     DecodePoints(texture_coordinates, builder.texCoords());
   }
   if (colors.data()) {
     // SkVertices::Builder assumes equal numbers of elements
-    FXL_DCHECK(positions.num_elements() == colors.num_elements());
+    FML_DCHECK(positions.num_elements() == colors.num_elements());
     DecodeInts<SkColor>(colors, builder.colors());
   }
 
diff --git a/lib/ui/painting/vertices.h b/lib/ui/painting/vertices.h
index 8178e9763be097b44ac638904ab7bfe2f203723f..d4871383857819cf0081449522d8b2d15556788d 100644
--- a/lib/ui/painting/vertices.h
+++ b/lib/ui/painting/vertices.h
@@ -18,14 +18,14 @@ namespace blink {
 
 class Vertices : public RefCountedDartWrappable<Vertices> {
   DEFINE_WRAPPERTYPEINFO();
-  FRIEND_MAKE_REF_COUNTED(Vertices);
+  FML_FRIEND_MAKE_REF_COUNTED(Vertices);
 
  public:
   ~Vertices() override;
 
   static void RegisterNatives(tonic::DartLibraryNatives* natives);
 
-  static fxl::RefPtr<Vertices> Create();
+  static fml::RefPtr<Vertices> Create();
 
   void init(SkVertices::VertexMode vertex_mode,
             const tonic::Float32List& positions,
diff --git a/lib/ui/plugins/callback_cache.cc b/lib/ui/plugins/callback_cache.cc
index 1799fcbc73ec55aab0b562bd7c028d9fba351b44..031f7d7cf34721ed90f65dc3411f9dd357dc0bad 100644
--- a/lib/ui/plugins/callback_cache.cc
+++ b/lib/ui/plugins/callback_cache.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "flutter/lib/ui/plugins/callback_cache.h"
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 #include "third_party/tonic/converter/dart_converter.h"
 
 using tonic::ToDart;
diff --git a/lib/ui/plugins/callback_cache.h b/lib/ui/plugins/callback_cache.h
index a32dfcbbcf02c9ed582a6850c3dcfa2472a76eeb..4922ab3333669b7dcd6a4efb96718443f1843333 100644
--- a/lib/ui/plugins/callback_cache.h
+++ b/lib/ui/plugins/callback_cache.h
@@ -10,8 +10,8 @@
 #include <mutex>
 #include <string>
 
+#include "flutter/fml/macros.h"
 #include "flutter/fml/synchronization/thread_annotations.h"
-#include "lib/fxl/macros.h"
 #include "third_party/dart/runtime/include/dart_api.h"
 
 #define DART_CALLBACK_INVALID_HANDLE -1
@@ -47,7 +47,7 @@ class DartCallbackCache {
   static std::map<int64_t, DartCallbackRepresentation> cache_
       FML_GUARDED_BY(mutex_);
 
-  FXL_DISALLOW_IMPLICIT_CONSTRUCTORS(DartCallbackCache);
+  FML_DISALLOW_IMPLICIT_CONSTRUCTORS(DartCallbackCache);
 };
 
 }  // namespace blink
diff --git a/lib/ui/semantics/semantics_update.cc b/lib/ui/semantics/semantics_update.cc
index 9e655b392b2eebcaa458747ce36112d05e26ae1a..a35befce6c384e534866aa49df441a96a9bbd20d 100644
--- a/lib/ui/semantics/semantics_update.cc
+++ b/lib/ui/semantics/semantics_update.cc
@@ -20,10 +20,10 @@ IMPLEMENT_WRAPPERTYPEINFO(ui, SemanticsUpdate);
 
 DART_BIND_ALL(SemanticsUpdate, FOR_EACH_BINDING)
 
-fxl::RefPtr<SemanticsUpdate> SemanticsUpdate::create(
+fml::RefPtr<SemanticsUpdate> SemanticsUpdate::create(
     SemanticsNodeUpdates nodes,
     CustomAccessibilityActionUpdates actions) {
-  return fxl::MakeRefCounted<SemanticsUpdate>(std::move(nodes),
+  return fml::MakeRefCounted<SemanticsUpdate>(std::move(nodes),
                                               std::move(actions));
 }
 
diff --git a/lib/ui/semantics/semantics_update.h b/lib/ui/semantics/semantics_update.h
index f6984fea6e195fa725bae89a437080e079d8c32c..21e75f60528a332f072b55f4ae46c33954cdd1a6 100644
--- a/lib/ui/semantics/semantics_update.h
+++ b/lib/ui/semantics/semantics_update.h
@@ -17,11 +17,11 @@ namespace blink {
 
 class SemanticsUpdate : public RefCountedDartWrappable<SemanticsUpdate> {
   DEFINE_WRAPPERTYPEINFO();
-  FRIEND_MAKE_REF_COUNTED(SemanticsUpdate);
+  FML_FRIEND_MAKE_REF_COUNTED(SemanticsUpdate);
 
  public:
   ~SemanticsUpdate() override;
-  static fxl::RefPtr<SemanticsUpdate> create(
+  static fml::RefPtr<SemanticsUpdate> create(
       SemanticsNodeUpdates nodes,
       CustomAccessibilityActionUpdates actions);
 
diff --git a/lib/ui/semantics/semantics_update_builder.cc b/lib/ui/semantics/semantics_update_builder.cc
index 618f80552b9ac41aed0afd2f0a294c27312e40fb..8c53103808c58c92fb9d3366fd4f5fdd95bc6d0c 100644
--- a/lib/ui/semantics/semantics_update_builder.cc
+++ b/lib/ui/semantics/semantics_update_builder.cc
@@ -100,7 +100,7 @@ void SemanticsUpdateBuilder::updateCustomAction(int id,
   actions_[id] = action;
 }
 
-fxl::RefPtr<SemanticsUpdate> SemanticsUpdateBuilder::build() {
+fml::RefPtr<SemanticsUpdate> SemanticsUpdateBuilder::build() {
   return SemanticsUpdate::create(std::move(nodes_), std::move(actions_));
 }
 
diff --git a/lib/ui/semantics/semantics_update_builder.h b/lib/ui/semantics/semantics_update_builder.h
index 9022fe3421fcad6929f74b31303ec6209bd8da0b..5fa9f2f4bf2da66be9b3aa0dd57b3d29294fed68 100644
--- a/lib/ui/semantics/semantics_update_builder.h
+++ b/lib/ui/semantics/semantics_update_builder.h
@@ -15,11 +15,11 @@ namespace blink {
 class SemanticsUpdateBuilder
     : public RefCountedDartWrappable<SemanticsUpdateBuilder> {
   DEFINE_WRAPPERTYPEINFO();
-  FRIEND_MAKE_REF_COUNTED(SemanticsUpdateBuilder);
+  FML_FRIEND_MAKE_REF_COUNTED(SemanticsUpdateBuilder);
 
  public:
-  static fxl::RefPtr<SemanticsUpdateBuilder> create() {
-    return fxl::MakeRefCounted<SemanticsUpdateBuilder>();
+  static fml::RefPtr<SemanticsUpdateBuilder> create() {
+    return fml::MakeRefCounted<SemanticsUpdateBuilder>();
   }
 
   ~SemanticsUpdateBuilder() override;
@@ -52,7 +52,7 @@ class SemanticsUpdateBuilder
                           std::string hint,
                           int overrideId);
 
-  fxl::RefPtr<SemanticsUpdate> build();
+  fml::RefPtr<SemanticsUpdate> build();
 
   static void RegisterNatives(tonic::DartLibraryNatives* natives);
 
diff --git a/lib/ui/text/asset_manager_font_provider.cc b/lib/ui/text/asset_manager_font_provider.cc
index bbb9a19785bceb0d72a3235397740205e25b645f..7edcbe6706f3f59081c16f150dd4e5a1c138afe8 100644
--- a/lib/ui/text/asset_manager_font_provider.cc
+++ b/lib/ui/text/asset_manager_font_provider.cc
@@ -4,7 +4,7 @@
 
 #include "flutter/lib/ui/text/asset_manager_font_provider.h"
 
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 #include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkStream.h"
 #include "third_party/skia/include/core/SkString.h"
@@ -33,7 +33,7 @@ size_t AssetManagerFontProvider::GetFamilyCount() const {
 
 // |FontAssetProvider|
 std::string AssetManagerFontProvider::GetFamilyName(int index) const {
-  FXL_DCHECK(index >= 0 && static_cast<size_t>(index) < family_names_.size());
+  FML_DCHECK(index >= 0 && static_cast<size_t>(index) < family_names_.size());
   return family_names_[index];
 }
 
@@ -80,7 +80,7 @@ int AssetManagerFontStyleSet::count() {
 void AssetManagerFontStyleSet::getStyle(int index,
                                         SkFontStyle*,
                                         SkString* style) {
-  FXL_DCHECK(false);
+  FML_DCHECK(false);
 }
 
 SkTypeface* AssetManagerFontStyleSet::createTypeface(int i) {
diff --git a/lib/ui/text/asset_manager_font_provider.h b/lib/ui/text/asset_manager_font_provider.h
index f9bc2fc6a21799468341fe190959b78db58f690e..a6f9544ab26114eb744a76fab5b40e1955efdef5 100644
--- a/lib/ui/text/asset_manager_font_provider.h
+++ b/lib/ui/text/asset_manager_font_provider.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "flutter/assets/asset_manager.h"
-#include "lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 #include "third_party/skia/include/core/SkFontMgr.h"
 #include "txt/font_asset_provider.h"
 
@@ -46,7 +46,7 @@ class AssetManagerFontStyleSet : public SkFontStyleSet {
   };
   std::vector<TypefaceAsset> assets_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(AssetManagerFontStyleSet);
+  FML_DISALLOW_COPY_AND_ASSIGN(AssetManagerFontStyleSet);
 };
 
 class AssetManagerFontProvider : public txt::FontAssetProvider {
@@ -71,7 +71,7 @@ class AssetManagerFontProvider : public txt::FontAssetProvider {
       registered_families_;
   std::vector<std::string> family_names_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(AssetManagerFontProvider);
+  FML_DISALLOW_COPY_AND_ASSIGN(AssetManagerFontProvider);
 };
 
 }  // namespace blink
diff --git a/lib/ui/text/font_collection.cc b/lib/ui/text/font_collection.cc
index b0ecc7514bb5f763d67449e52a56112a0b0a7586..987bbfaa76041948434e67d489c17b98d8d933a8 100644
--- a/lib/ui/text/font_collection.cc
+++ b/lib/ui/text/font_collection.cc
@@ -38,7 +38,7 @@ void FontCollection::RegisterFonts(fml::RefPtr<AssetManager> asset_manager) {
   std::unique_ptr<fml::Mapping> manifest_mapping =
       asset_manager->GetAsMapping("FontManifest.json");
   if (manifest_mapping == nullptr) {
-    FXL_DLOG(WARNING) << "Could not find the font manifest in the asset store.";
+    FML_DLOG(WARNING) << "Could not find the font manifest in the asset store.";
     return;
   }
 
@@ -49,7 +49,7 @@ void FontCollection::RegisterFonts(fml::RefPtr<AssetManager> asset_manager) {
                  manifest_mapping->GetSize());
 
   if (document.HasParseError()) {
-    FXL_DLOG(WARNING) << "Error parsing the font manifest in the asset store.";
+    FML_DLOG(WARNING) << "Error parsing the font manifest in the asset store.";
     return;
   }
 
diff --git a/lib/ui/text/font_collection.h b/lib/ui/text/font_collection.h
index 02cca0bb517247323019ade16ee6737507b1f0fe..c9ef29cc05ade951be142523573bb0ad40adb393 100644
--- a/lib/ui/text/font_collection.h
+++ b/lib/ui/text/font_collection.h
@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "flutter/assets/asset_manager.h"
-#include "lib/fxl/macros.h"
-#include "lib/fxl/memory/ref_ptr.h"
+#include "flutter/fml/macros.h"
+#include "flutter/fml/memory/ref_ptr.h"
 #include "txt/font_collection.h"
 
 namespace blink {
@@ -30,7 +30,7 @@ class FontCollection {
  private:
   std::shared_ptr<txt::FontCollection> collection_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(FontCollection);
+  FML_DISALLOW_COPY_AND_ASSIGN(FontCollection);
 };
 
 }  // namespace blink
diff --git a/lib/ui/text/paragraph.cc b/lib/ui/text/paragraph.cc
index b26b0b94f0b1b93ce3b578ec64adf5878ac1f565..94277c51be8a4b11724d95a978517052c942a2fe 100644
--- a/lib/ui/text/paragraph.cc
+++ b/lib/ui/text/paragraph.cc
@@ -6,8 +6,8 @@
 
 #include "flutter/common/settings.h"
 #include "flutter/common/task_runners.h"
-#include "lib/fxl/logging.h"
-#include "lib/fxl/tasks/task_runner.h"
+#include "flutter/fml/logging.h"
+#include "flutter/fml/task_runner.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_args.h"
 #include "third_party/tonic/dart_binding_macros.h"
diff --git a/lib/ui/text/paragraph.h b/lib/ui/text/paragraph.h
index 2b6ebf561faece08740867b4fe994a5b51cabccc..e5f5e2bddb703af5976171af2f8adf76cee11283 100644
--- a/lib/ui/text/paragraph.h
+++ b/lib/ui/text/paragraph.h
@@ -21,12 +21,12 @@ namespace blink {
 
 class Paragraph : public RefCountedDartWrappable<Paragraph> {
   DEFINE_WRAPPERTYPEINFO();
-  FRIEND_MAKE_REF_COUNTED(Paragraph);
+  FML_FRIEND_MAKE_REF_COUNTED(Paragraph);
 
  public:
-  static fxl::RefPtr<Paragraph> Create(
+  static fml::RefPtr<Paragraph> Create(
       std::unique_ptr<txt::Paragraph> paragraph) {
-    return fxl::MakeRefCounted<Paragraph>(std::move(paragraph));
+    return fml::MakeRefCounted<Paragraph>(std::move(paragraph));
   }
 
   ~Paragraph() override;
diff --git a/lib/ui/text/paragraph_builder.cc b/lib/ui/text/paragraph_builder.cc
index 47c97e6aab63e60a01021137769ed79c9d9eb173..15ce9c8167e0cbe5acf268a4617e3b9491e0d7a9 100644
--- a/lib/ui/text/paragraph_builder.cc
+++ b/lib/ui/text/paragraph_builder.cc
@@ -6,6 +6,7 @@
 
 #include "flutter/common/settings.h"
 #include "flutter/common/task_runners.h"
+#include "flutter/fml/task_runner.h"
 #include "flutter/lib/ui/text/font_collection.h"
 #include "flutter/lib/ui/ui_dart_state.h"
 #include "flutter/lib/ui/window/window.h"
@@ -14,7 +15,6 @@
 #include "flutter/third_party/txt/src/txt/paragraph_style.h"
 #include "flutter/third_party/txt/src/txt/text_decoration.h"
 #include "flutter/third_party/txt/src/txt/text_style.h"
-#include "lib/fxl/tasks/task_runner.h"
 #include "third_party/icu/source/common/unicode/ustring.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_args.h"
@@ -104,14 +104,14 @@ void ParagraphBuilder::RegisterNatives(tonic::DartLibraryNatives* natives) {
        FOR_EACH_BINDING(DART_REGISTER_NATIVE)});
 }
 
-fxl::RefPtr<ParagraphBuilder> ParagraphBuilder::create(
+fml::RefPtr<ParagraphBuilder> ParagraphBuilder::create(
     tonic::Int32List& encoded,
     const std::string& fontFamily,
     double fontSize,
     double lineHeight,
     const std::u16string& ellipsis,
     const std::string& locale) {
-  return fxl::MakeRefCounted<ParagraphBuilder>(encoded, fontFamily, fontSize,
+  return fml::MakeRefCounted<ParagraphBuilder>(encoded, fontFamily, fontSize,
                                                lineHeight, ellipsis, locale);
 }
 
@@ -175,7 +175,7 @@ void ParagraphBuilder::pushStyle(tonic::Int32List& encoded,
                                  Dart_Handle background_data,
                                  Dart_Handle foreground_objects,
                                  Dart_Handle foreground_data) {
-  FXL_DCHECK(encoded.num_elements() == 8);
+  FML_DCHECK(encoded.num_elements() == 8);
 
   int32_t mask = encoded[0];
 
@@ -274,7 +274,7 @@ Dart_Handle ParagraphBuilder::addText(const std::u16string& text) {
   return Dart_Null();
 }
 
-fxl::RefPtr<Paragraph> ParagraphBuilder::build() {
+fml::RefPtr<Paragraph> ParagraphBuilder::build() {
   return Paragraph::Create(m_paragraphBuilder->Build());
 }
 
diff --git a/lib/ui/text/paragraph_builder.h b/lib/ui/text/paragraph_builder.h
index 82d88cc3ee06e5f5b0b20843ce81c37f874830a7..56f12b1de6d148457f6959398d97c132428b4f60 100644
--- a/lib/ui/text/paragraph_builder.h
+++ b/lib/ui/text/paragraph_builder.h
@@ -22,10 +22,10 @@ class Paragraph;
 
 class ParagraphBuilder : public RefCountedDartWrappable<ParagraphBuilder> {
   DEFINE_WRAPPERTYPEINFO();
-  FRIEND_MAKE_REF_COUNTED(ParagraphBuilder);
+  FML_FRIEND_MAKE_REF_COUNTED(ParagraphBuilder);
 
  public:
-  static fxl::RefPtr<ParagraphBuilder> create(tonic::Int32List& encoded,
+  static fml::RefPtr<ParagraphBuilder> create(tonic::Int32List& encoded,
                                               const std::string& fontFamily,
                                               double fontSize,
                                               double lineHeight,
@@ -50,7 +50,7 @@ class ParagraphBuilder : public RefCountedDartWrappable<ParagraphBuilder> {
 
   Dart_Handle addText(const std::u16string& text);
 
-  fxl::RefPtr<Paragraph> build();
+  fml::RefPtr<Paragraph> build();
 
   static void RegisterNatives(tonic::DartLibraryNatives* natives);
 
diff --git a/lib/ui/text/paragraph_impl_txt.cc b/lib/ui/text/paragraph_impl_txt.cc
index 374f8d95d772771a1a1aae29bcd1b83726c40af2..ccd77287ecaa32a17ca19e2104254d483ff67285 100644
--- a/lib/ui/text/paragraph_impl_txt.cc
+++ b/lib/ui/text/paragraph_impl_txt.cc
@@ -5,10 +5,10 @@
 #include "flutter/lib/ui/text/paragraph_impl_txt.h"
 
 #include "flutter/common/task_runners.h"
+#include "flutter/fml/logging.h"
+#include "flutter/fml/task_runner.h"
 #include "flutter/lib/ui/text/paragraph.h"
 #include "flutter/lib/ui/text/paragraph_impl.h"
-#include "lib/fxl/logging.h"
-#include "lib/fxl/tasks/task_runner.h"
 #include "third_party/skia/include/core/SkPoint.h"
 #include "third_party/tonic/converter/dart_converter.h"
 
diff --git a/lib/ui/text/text_box.cc b/lib/ui/text/text_box.cc
index 6cfdab2bfbf733e32be100968c3f4c5151d81dd7..8e254afe40ad943208bac1a22c3262e05268146b 100644
--- a/lib/ui/text/text_box.cc
+++ b/lib/ui/text/text_box.cc
@@ -4,7 +4,7 @@
 
 #include "flutter/lib/ui/text/text_box.h"
 
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 #include "third_party/tonic/dart_class_library.h"
 #include "third_party/tonic/dart_state.h"
 #include "third_party/tonic/logging/dart_error.h"
@@ -19,7 +19,7 @@ Dart_Handle GetTextBoxType() {
   DartClassLibrary& class_library = DartState::Current()->class_library();
   Dart_Handle type =
       Dart_HandleFromPersistent(class_library.GetClass("ui", "TextBox"));
-  FXL_DCHECK(!LogIfError(type));
+  FML_DCHECK(!LogIfError(type));
   return type;
 }
 
diff --git a/lib/ui/ui_dart_state.cc b/lib/ui/ui_dart_state.cc
index 863870f4b23d7a957dcadf5fe2b555f7b66b2aec..0d762f785262d739d6d3021a9bf18d093e35a4f8 100644
--- a/lib/ui/ui_dart_state.cc
+++ b/lib/ui/ui_dart_state.cc
@@ -17,7 +17,7 @@ UIDartState::UIDartState(TaskRunners task_runners,
                          TaskObserverAdd add_callback,
                          TaskObserverRemove remove_callback,
                          fml::WeakPtr<GrContext> resource_context,
-                         fxl::RefPtr<flow::SkiaUnrefQueue> skia_unref_queue,
+                         fml::RefPtr<flow::SkiaUnrefQueue> skia_unref_queue,
                          std::string advisory_script_uri,
                          std::string advisory_script_entrypoint,
                          std::string logger_prefix,
@@ -67,7 +67,7 @@ const TaskRunners& UIDartState::GetTaskRunners() const {
   return task_runners_;
 }
 
-fxl::RefPtr<flow::SkiaUnrefQueue> UIDartState::GetSkiaUnrefQueue() const {
+fml::RefPtr<flow::SkiaUnrefQueue> UIDartState::GetSkiaUnrefQueue() const {
   return skia_unref_queue_;
 }
 
@@ -90,7 +90,7 @@ void UIDartState::AddOrRemoveTaskObserver(bool add) {
     // the service isolate).
     return;
   }
-  FXL_DCHECK(add_callback_ && remove_callback_);
+  FML_DCHECK(add_callback_ && remove_callback_);
   if (add) {
     add_callback_(reinterpret_cast<intptr_t>(this),
                   [this]() { this->FlushMicrotasksNow(); });
diff --git a/lib/ui/ui_dart_state.h b/lib/ui/ui_dart_state.h
index 597031ca7be1794fe3a8d3a2f6e16a306b4496bc..6d4094a47f2becf737bcd985fe052b038a1d7060 100644
--- a/lib/ui/ui_dart_state.h
+++ b/lib/ui/ui_dart_state.h
@@ -12,9 +12,9 @@
 #include "flutter/common/settings.h"
 #include "flutter/common/task_runners.h"
 #include "flutter/flow/skia_gpu_object.h"
+#include "flutter/fml/build_config.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/lib/ui/isolate_name_server/isolate_name_server.h"
-#include "lib/fxl/build_config.h"
 #include "third_party/dart/runtime/include/dart_api.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 #include "third_party/tonic/dart_microtask_queue.h"
@@ -43,7 +43,7 @@ class UIDartState : public tonic::DartState {
 
   void FlushMicrotasksNow();
 
-  fxl::RefPtr<flow::SkiaUnrefQueue> GetSkiaUnrefQueue() const;
+  fml::RefPtr<flow::SkiaUnrefQueue> GetSkiaUnrefQueue() const;
 
   fml::WeakPtr<GrContext> GetResourceContext() const;
 
@@ -57,7 +57,7 @@ class UIDartState : public tonic::DartState {
       return {};
     }
     auto state = UIDartState::Current();
-    FXL_DCHECK(state);
+    FML_DCHECK(state);
     auto queue = state->GetSkiaUnrefQueue();
     return {std::move(object), std::move(queue)};
   };
@@ -67,7 +67,7 @@ class UIDartState : public tonic::DartState {
               TaskObserverAdd add_callback,
               TaskObserverRemove remove_callback,
               fml::WeakPtr<GrContext> resource_context,
-              fxl::RefPtr<flow::SkiaUnrefQueue> skia_unref_queue,
+              fml::RefPtr<flow::SkiaUnrefQueue> skia_unref_queue,
               std::string advisory_script_uri,
               std::string advisory_script_entrypoint,
               std::string logger_prefix,
@@ -94,7 +94,7 @@ class UIDartState : public tonic::DartState {
   Dart_Port main_port_ = ILLEGAL_PORT;
   std::string debug_name_;
   std::unique_ptr<Window> window_;
-  fxl::RefPtr<flow::SkiaUnrefQueue> skia_unref_queue_;
+  fml::RefPtr<flow::SkiaUnrefQueue> skia_unref_queue_;
   tonic::DartMicrotaskQueue microtask_queue_;
   IsolateNameServer* isolate_name_server_;
 
diff --git a/lib/ui/window/platform_message.cc b/lib/ui/window/platform_message.cc
index 291fc4c522c0ab60d93e0c04a522936e32c1ef4d..ca9d92c74e827138ed61d330c04e7da7452ec11c 100644
--- a/lib/ui/window/platform_message.cc
+++ b/lib/ui/window/platform_message.cc
@@ -10,13 +10,13 @@ namespace blink {
 
 PlatformMessage::PlatformMessage(std::string channel,
                                  std::vector<uint8_t> data,
-                                 fxl::RefPtr<PlatformMessageResponse> response)
+                                 fml::RefPtr<PlatformMessageResponse> response)
     : channel_(std::move(channel)),
       data_(std::move(data)),
       hasData_(true),
       response_(std::move(response)) {}
 PlatformMessage::PlatformMessage(std::string channel,
-                                 fxl::RefPtr<PlatformMessageResponse> response)
+                                 fml::RefPtr<PlatformMessageResponse> response)
     : channel_(std::move(channel)),
       data_(),
       hasData_(false),
diff --git a/lib/ui/window/platform_message.h b/lib/ui/window/platform_message.h
index 76981ec52b2578c596ae434fc9a85e4901fc7639..6044c94e7c43dac75753efd845ff64fd766dff4f 100644
--- a/lib/ui/window/platform_message.h
+++ b/lib/ui/window/platform_message.h
@@ -8,37 +8,37 @@
 #include <string>
 #include <vector>
 
+#include "flutter/fml/memory/ref_counted.h"
+#include "flutter/fml/memory/ref_ptr.h"
 #include "flutter/lib/ui/window/platform_message_response.h"
-#include "lib/fxl/memory/ref_counted.h"
-#include "lib/fxl/memory/ref_ptr.h"
 
 namespace blink {
 
-class PlatformMessage : public fxl::RefCountedThreadSafe<PlatformMessage> {
-  FRIEND_REF_COUNTED_THREAD_SAFE(PlatformMessage);
-  FRIEND_MAKE_REF_COUNTED(PlatformMessage);
+class PlatformMessage : public fml::RefCountedThreadSafe<PlatformMessage> {
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(PlatformMessage);
+  FML_FRIEND_MAKE_REF_COUNTED(PlatformMessage);
 
  public:
   const std::string& channel() const { return channel_; }
   const std::vector<uint8_t>& data() const { return data_; }
   bool hasData() { return hasData_; }
 
-  const fxl::RefPtr<PlatformMessageResponse>& response() const {
+  const fml::RefPtr<PlatformMessageResponse>& response() const {
     return response_;
   }
 
  private:
   PlatformMessage(std::string name,
                   std::vector<uint8_t> data,
-                  fxl::RefPtr<PlatformMessageResponse> response);
+                  fml::RefPtr<PlatformMessageResponse> response);
   PlatformMessage(std::string name,
-                  fxl::RefPtr<PlatformMessageResponse> response);
+                  fml::RefPtr<PlatformMessageResponse> response);
   ~PlatformMessage();
 
   std::string channel_;
   std::vector<uint8_t> data_;
   bool hasData_;
-  fxl::RefPtr<PlatformMessageResponse> response_;
+  fml::RefPtr<PlatformMessageResponse> response_;
 };
 
 }  // namespace blink
diff --git a/lib/ui/window/platform_message_response.h b/lib/ui/window/platform_message_response.h
index 7e259088297399ea9b78a0a1da3b55c5dd19938b..c31779c24bc082218140ca868ef3b54cf9ffc3cd 100644
--- a/lib/ui/window/platform_message_response.h
+++ b/lib/ui/window/platform_message_response.h
@@ -8,14 +8,14 @@
 #include <vector>
 
 #include "flutter/fml/mapping.h"
-#include "lib/fxl/memory/ref_counted.h"
-#include "lib/fxl/memory/ref_ptr.h"
+#include "flutter/fml/memory/ref_counted.h"
+#include "flutter/fml/memory/ref_ptr.h"
 
 namespace blink {
 
 class PlatformMessageResponse
-    : public fxl::RefCountedThreadSafe<PlatformMessageResponse> {
-  FRIEND_REF_COUNTED_THREAD_SAFE(PlatformMessageResponse);
+    : public fml::RefCountedThreadSafe<PlatformMessageResponse> {
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(PlatformMessageResponse);
 
  public:
   // Callable on any thread.
diff --git a/lib/ui/window/platform_message_response_dart.cc b/lib/ui/window/platform_message_response_dart.cc
index f6c21b5d5aacf3985ecb64aff740b0e8881cf060..e91bcfd4247e44df4fa0cffb9b2318bc53bc8170 100644
--- a/lib/ui/window/platform_message_response_dart.cc
+++ b/lib/ui/window/platform_message_response_dart.cc
@@ -7,8 +7,8 @@
 #include <utility>
 
 #include "flutter/common/task_runners.h"
+#include "flutter/fml/make_copyable.h"
 #include "flutter/lib/ui/window/window.h"
-#include "lib/fxl/functional/make_copyable.h"
 #include "third_party/tonic/dart_state.h"
 #include "third_party/tonic/logging/dart_invoke.h"
 
@@ -49,13 +49,13 @@ Dart_Handle WrapByteData(std::unique_ptr<fml::Mapping> mapping) {
 
 PlatformMessageResponseDart::PlatformMessageResponseDart(
     tonic::DartPersistentValue callback,
-    fxl::RefPtr<fxl::TaskRunner> ui_task_runner)
+    fml::RefPtr<fml::TaskRunner> ui_task_runner)
     : callback_(std::move(callback)),
       ui_task_runner_(std::move(ui_task_runner)) {}
 
 PlatformMessageResponseDart::~PlatformMessageResponseDart() {
   if (!callback_.is_empty()) {
-    ui_task_runner_->PostTask(fxl::MakeCopyable(
+    ui_task_runner_->PostTask(fml::MakeCopyable(
         [callback = std::move(callback_)]() mutable { callback.Clear(); }));
   }
 }
@@ -63,9 +63,9 @@ PlatformMessageResponseDart::~PlatformMessageResponseDart() {
 void PlatformMessageResponseDart::Complete(std::unique_ptr<fml::Mapping> data) {
   if (callback_.is_empty())
     return;
-  FXL_DCHECK(!is_complete_);
+  FML_DCHECK(!is_complete_);
   is_complete_ = true;
-  ui_task_runner_->PostTask(fxl::MakeCopyable(
+  ui_task_runner_->PostTask(fml::MakeCopyable(
       [callback = std::move(callback_), data = std::move(data)]() mutable {
         std::shared_ptr<tonic::DartState> dart_state =
             callback.dart_state().lock();
@@ -81,10 +81,10 @@ void PlatformMessageResponseDart::Complete(std::unique_ptr<fml::Mapping> data) {
 void PlatformMessageResponseDart::CompleteEmpty() {
   if (callback_.is_empty())
     return;
-  FXL_DCHECK(!is_complete_);
+  FML_DCHECK(!is_complete_);
   is_complete_ = true;
   ui_task_runner_->PostTask(
-      fxl::MakeCopyable([callback = std::move(callback_)]() mutable {
+      fml::MakeCopyable([callback = std::move(callback_)]() mutable {
         std::shared_ptr<tonic::DartState> dart_state =
             callback.dart_state().lock();
         if (!dart_state)
diff --git a/lib/ui/window/platform_message_response_dart.h b/lib/ui/window/platform_message_response_dart.h
index bb29df7446d74af85a15c761c1b04e1cdd4c56da..274b1e08d91b7b0de8e9b904990be8cd3fcd968d 100644
--- a/lib/ui/window/platform_message_response_dart.h
+++ b/lib/ui/window/platform_message_response_dart.h
@@ -12,7 +12,7 @@
 namespace blink {
 
 class PlatformMessageResponseDart : public PlatformMessageResponse {
-  FRIEND_MAKE_REF_COUNTED(PlatformMessageResponseDart);
+  FML_FRIEND_MAKE_REF_COUNTED(PlatformMessageResponseDart);
 
  public:
   // Callable on any thread.
@@ -22,11 +22,11 @@ class PlatformMessageResponseDart : public PlatformMessageResponse {
  protected:
   explicit PlatformMessageResponseDart(
       tonic::DartPersistentValue callback,
-      fxl::RefPtr<fxl::TaskRunner> ui_task_runner);
+      fml::RefPtr<fml::TaskRunner> ui_task_runner);
   ~PlatformMessageResponseDart() override;
 
   tonic::DartPersistentValue callback_;
-  fxl::RefPtr<fxl::TaskRunner> ui_task_runner_;
+  fml::RefPtr<fml::TaskRunner> ui_task_runner_;
 };
 
 }  // namespace blink
diff --git a/lib/ui/window/pointer_data_packet.h b/lib/ui/window/pointer_data_packet.h
index fb3fb5d7739464cbb95201e72cd25264a03c11aa..fafa03d7a7d86829f2e317a186515300636c5b1d 100644
--- a/lib/ui/window/pointer_data_packet.h
+++ b/lib/ui/window/pointer_data_packet.h
@@ -9,8 +9,8 @@
 
 #include <vector>
 
+#include "flutter/fml/macros.h"
 #include "flutter/lib/ui/window/pointer_data.h"
-#include "lib/fxl/macros.h"
 
 namespace blink {
 
@@ -26,7 +26,7 @@ class PointerDataPacket {
  private:
   std::vector<uint8_t> data_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(PointerDataPacket);
+  FML_DISALLOW_COPY_AND_ASSIGN(PointerDataPacket);
 };
 
 }  // namespace blink
diff --git a/lib/ui/window/window.cc b/lib/ui/window/window.cc
index 160a9f2e03cfbc59683fc3868505117cc45e3567..834e04f41315e42ace45a9a5210adcad9ddcd333 100644
--- a/lib/ui/window/window.cc
+++ b/lib/ui/window/window.cc
@@ -66,20 +66,20 @@ Dart_Handle SendPlatformMessage(Dart_Handle window,
     return ToDart("Platform messages can only be sent from the main isolate");
   }
 
-  fxl::RefPtr<PlatformMessageResponse> response;
+  fml::RefPtr<PlatformMessageResponse> response;
   if (!Dart_IsNull(callback)) {
-    response = fxl::MakeRefCounted<PlatformMessageResponseDart>(
+    response = fml::MakeRefCounted<PlatformMessageResponseDart>(
         tonic::DartPersistentValue(dart_state, callback),
         dart_state->GetTaskRunners().GetUITaskRunner());
   }
   if (Dart_IsNull(data.dart_handle())) {
     dart_state->window()->client()->HandlePlatformMessage(
-        fxl::MakeRefCounted<PlatformMessage>(name, response));
+        fml::MakeRefCounted<PlatformMessage>(name, response));
   } else {
     const uint8_t* buffer = static_cast<const uint8_t*>(data.data());
 
     dart_state->window()->client()->HandlePlatformMessage(
-        fxl::MakeRefCounted<PlatformMessage>(
+        fml::MakeRefCounted<PlatformMessage>(
             name, std::vector<uint8_t>(buffer, buffer + data.length_in_bytes()),
             response));
   }
@@ -121,7 +121,7 @@ Dart_Handle ToByteData(const std::vector<uint8_t>& buffer) {
   Dart_TypedData_Type type;
   void* data = nullptr;
   intptr_t num_bytes = 0;
-  FXL_CHECK(!Dart_IsError(
+  FML_CHECK(!Dart_IsError(
       Dart_TypedDataAcquireData(data_handle, &type, &data, &num_bytes)));
 
   memcpy(data, buffer.data(), num_bytes);
@@ -208,7 +208,7 @@ void Window::UpdateAssistiveTechnologyEnabled(bool enabled) {
                   {ToDart(enabled)});
 }
 
-void Window::DispatchPlatformMessage(fxl::RefPtr<PlatformMessage> message) {
+void Window::DispatchPlatformMessage(fml::RefPtr<PlatformMessage> message) {
   std::shared_ptr<tonic::DartState> dart_state = library_.dart_state().lock();
   if (!dart_state)
     return;
@@ -260,13 +260,13 @@ void Window::DispatchSemanticsAction(int32_t id,
       {ToDart(id), ToDart(static_cast<int32_t>(action)), args_handle});
 }
 
-void Window::BeginFrame(fxl::TimePoint frameTime) {
+void Window::BeginFrame(fml::TimePoint frameTime) {
   std::shared_ptr<tonic::DartState> dart_state = library_.dart_state().lock();
   if (!dart_state)
     return;
   tonic::DartState::Scope scope(dart_state);
 
-  int64_t microseconds = (frameTime - fxl::TimePoint()).ToMicroseconds();
+  int64_t microseconds = (frameTime - fml::TimePoint()).ToMicroseconds();
 
   DartInvokeField(library_.value(), "_beginFrame",
                   {
diff --git a/lib/ui/window/window.h b/lib/ui/window/window.h
index 650bb18f2e0dfe4292753ed3e07d69e6980670f8..8669b916b918fe5fade6ae0fc10d34614ae66203 100644
--- a/lib/ui/window/window.h
+++ b/lib/ui/window/window.h
@@ -7,11 +7,11 @@
 
 #include <unordered_map>
 
+#include "flutter/fml/time/time_point.h"
 #include "flutter/lib/ui/semantics/semantics_update.h"
 #include "flutter/lib/ui/window/platform_message.h"
 #include "flutter/lib/ui/window/pointer_data_packet.h"
 #include "flutter/lib/ui/window/viewport_metrics.h"
-#include "lib/fxl/time/time_point.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 #include "third_party/tonic/dart_persistent_value.h"
 
@@ -31,7 +31,7 @@ class WindowClient {
   virtual void ScheduleFrame() = 0;
   virtual void Render(Scene* scene) = 0;
   virtual void UpdateSemantics(SemanticsUpdate* update) = 0;
-  virtual void HandlePlatformMessage(fxl::RefPtr<PlatformMessage> message) = 0;
+  virtual void HandlePlatformMessage(fml::RefPtr<PlatformMessage> message) = 0;
   virtual FontCollection& GetFontCollection() = 0;
 
  protected:
@@ -55,12 +55,12 @@ class Window final {
   void UpdateUserSettingsData(const std::string& data);
   void UpdateSemanticsEnabled(bool enabled);
   void UpdateAssistiveTechnologyEnabled(bool enabled);
-  void DispatchPlatformMessage(fxl::RefPtr<PlatformMessage> message);
+  void DispatchPlatformMessage(fml::RefPtr<PlatformMessage> message);
   void DispatchPointerDataPacket(const PointerDataPacket& packet);
   void DispatchSemanticsAction(int32_t id,
                                SemanticsAction action,
                                std::vector<uint8_t> args);
-  void BeginFrame(fxl::TimePoint frameTime);
+  void BeginFrame(fml::TimePoint frameTime);
 
   void CompletePlatformMessageResponse(int response_id,
                                        std::vector<uint8_t> data);
@@ -75,7 +75,7 @@ class Window final {
 
   // We use id 0 to mean that no response is expected.
   int next_response_id_ = 1;
-  std::unordered_map<int, fxl::RefPtr<blink::PlatformMessageResponse>>
+  std::unordered_map<int, fml::RefPtr<blink::PlatformMessageResponse>>
       pending_responses_;
 };
 
diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn
index a1c861e58fa9ffb9f9a94028d7aabae32e88b7a8..164a92e68624161a06e43b953022918df3f0715e 100644
--- a/runtime/BUILD.gn
+++ b/runtime/BUILD.gn
@@ -93,7 +93,6 @@ source_set("runtime") {
     "$flutter_root/lib/io",
     "$flutter_root/lib/ui",
     "$flutter_root/third_party/txt",
-    "//garnet/public/lib/fxl",
     "//third_party/dart/runtime:dart_api",
     "//third_party/dart/runtime/bin:embedded_dart_io",
     "//third_party/rapidjson",
@@ -129,7 +128,6 @@ executable("runtime_unittests") {
     "$flutter_root/fml",
     "$flutter_root/lib/snapshot",
     "$flutter_root/testing",
-    "//garnet/public/lib/fxl",
     "//third_party/dart/runtime:libdart_jit",
     "//third_party/skia",
     "//third_party/tonic",
diff --git a/runtime/dart_isolate.cc b/runtime/dart_isolate.cc
index c215917cb9dd9f82969afe4a61834ee944434ee3..8f083246eae55bc462d184520b305fd0919e80ff 100644
--- a/runtime/dart_isolate.cc
+++ b/runtime/dart_isolate.cc
@@ -7,13 +7,13 @@
 #include <cstdlib>
 #include <tuple>
 
+#include "flutter/fml/paths.h"
 #include "flutter/fml/trace_event.h"
 #include "flutter/lib/io/dart_io.h"
 #include "flutter/lib/ui/dart_runtime_hooks.h"
 #include "flutter/lib/ui/dart_ui.h"
 #include "flutter/runtime/dart_service_isolate.h"
 #include "flutter/runtime/dart_vm.h"
-#include "lib/fxl/files/path.h"
 #include "third_party/dart/runtime/include/dart_api.h"
 #include "third_party/dart/runtime/include/dart_tools_api.h"
 #include "third_party/tonic/converter/dart_converter.h"
@@ -34,12 +34,12 @@ namespace blink {
 
 std::weak_ptr<DartIsolate> DartIsolate::CreateRootIsolate(
     DartVM* vm,
-    fxl::RefPtr<DartSnapshot> isolate_snapshot,
-    fxl::RefPtr<DartSnapshot> shared_snapshot,
+    fml::RefPtr<DartSnapshot> isolate_snapshot,
+    fml::RefPtr<DartSnapshot> shared_snapshot,
     TaskRunners task_runners,
     std::unique_ptr<Window> window,
     fml::WeakPtr<GrContext> resource_context,
-    fxl::RefPtr<flow::SkiaUnrefQueue> unref_queue,
+    fml::RefPtr<flow::SkiaUnrefQueue> unref_queue,
     std::string advisory_script_uri,
     std::string advisory_script_entrypoint,
     Dart_IsolateFlags* flags) {
@@ -98,11 +98,11 @@ std::weak_ptr<DartIsolate> DartIsolate::CreateRootIsolate(
 }
 
 DartIsolate::DartIsolate(DartVM* vm,
-                         fxl::RefPtr<DartSnapshot> isolate_snapshot,
-                         fxl::RefPtr<DartSnapshot> shared_snapshot,
+                         fml::RefPtr<DartSnapshot> isolate_snapshot,
+                         fml::RefPtr<DartSnapshot> shared_snapshot,
                          TaskRunners task_runners,
                          fml::WeakPtr<GrContext> resource_context,
-                         fxl::RefPtr<flow::SkiaUnrefQueue> unref_queue,
+                         fml::RefPtr<flow::SkiaUnrefQueue> unref_queue,
                          std::string advisory_script_uri,
                          std::string advisory_script_entrypoint,
                          ChildIsolatePreparer child_isolate_preparer)
@@ -119,7 +119,7 @@ DartIsolate::DartIsolate(DartVM* vm,
       isolate_snapshot_(std::move(isolate_snapshot)),
       shared_snapshot_(std::move(shared_snapshot)),
       child_isolate_preparer_(std::move(child_isolate_preparer)) {
-  FXL_DCHECK(isolate_snapshot_) << "Must contain a valid isolate snapshot.";
+  FML_DCHECK(isolate_snapshot_) << "Must contain a valid isolate snapshot.";
 
   if (vm_ == nullptr) {
     return;
@@ -285,7 +285,7 @@ bool DartIsolate::PrepareForRunningFromPrecompiledCode() {
 bool DartIsolate::LoadScriptSnapshot(
     std::shared_ptr<const fml::Mapping> mapping,
     bool last_piece) {
-  FXL_CHECK(last_piece) << "Script snapshots cannot be divided";
+  FML_CHECK(last_piece) << "Script snapshots cannot be divided";
   if (tonic::LogIfError(Dart_LoadScriptFromSnapshot(mapping->GetMapping(),
                                                     mapping->GetSize()))) {
     return false;
@@ -327,7 +327,7 @@ bool DartIsolate::LoadSnapshot(std::shared_ptr<const fml::Mapping> mapping,
   return false;
 }
 
-FXL_WARN_UNUSED_RESULT
+FML_WARN_UNUSED_RESULT
 bool DartIsolate::PrepareForRunningFromSnapshot(
     std::shared_ptr<const fml::Mapping> mapping,
     bool last_piece) {
@@ -398,15 +398,15 @@ bool DartIsolate::PrepareForRunningFromSource(
   auto& loader = file_loader();
 
   if (!packages.empty()) {
-    auto packages_absolute_path = files::AbsolutePath(packages);
-    FXL_DLOG(INFO) << "Loading from packages: " << packages_absolute_path;
+    auto packages_absolute_path = fml::paths::AbsolutePath(packages);
+    FML_DLOG(INFO) << "Loading from packages: " << packages_absolute_path;
     if (!loader.LoadPackagesMap(packages_absolute_path)) {
       return false;
     }
   }
 
-  auto main_source_absolute_path = files::AbsolutePath(main_source_file);
-  FXL_DLOG(INFO) << "Loading from source: " << main_source_absolute_path;
+  auto main_source_absolute_path = fml::paths::AbsolutePath(main_source_file);
+  FML_DLOG(INFO) << "Loading from source: " << main_source_absolute_path;
 
   if (tonic::LogIfError(loader.LoadScript(main_source_absolute_path))) {
     return false;
@@ -443,7 +443,7 @@ bool DartIsolate::MarkIsolateRunnable() {
 
   char* error = Dart_IsolateMakeRunnable(isolate());
   if (error) {
-    FXL_DLOG(ERROR) << error;
+    FML_DLOG(ERROR) << error;
     ::free(error);
     // Failed. Restore the isolate.
     Dart_EnterIsolate(isolate());
@@ -454,7 +454,7 @@ bool DartIsolate::MarkIsolateRunnable() {
   return true;
 }
 
-FXL_WARN_UNUSED_RESULT
+FML_WARN_UNUSED_RESULT
 bool DartIsolate::Run(const std::string& entrypoint_name) {
   TRACE_EVENT0("flutter", "DartIsolate::Run");
   if (phase_ != Phase::Ready) {
@@ -486,11 +486,11 @@ bool DartIsolate::Run(const std::string& entrypoint_name) {
   }
 
   phase_ = Phase::Running;
-  FXL_DLOG(INFO) << "New isolate is in the running state.";
+  FML_DLOG(INFO) << "New isolate is in the running state.";
   return true;
 }
 
-FXL_WARN_UNUSED_RESULT
+FML_WARN_UNUSED_RESULT
 bool DartIsolate::RunFromLibrary(const std::string& library_name,
                                  const std::string& entrypoint_name) {
   TRACE_EVENT0("flutter", "DartIsolate::RunFromLibrary");
@@ -528,7 +528,7 @@ bool DartIsolate::RunFromLibrary(const std::string& library_name,
   }
 
   phase_ = Phase::Running;
-  FXL_DLOG(INFO) << "New isolate is in the running state.";
+  FML_DLOG(INFO) << "New isolate is in the running state.";
   return true;
 }
 
@@ -547,10 +547,10 @@ bool DartIsolate::Shutdown() {
   if (vm_isolate != nullptr) {
     // We need to enter the isolate because Dart_ShutdownIsolate does not take
     // the isolate to shutdown as a parameter.
-    FXL_DCHECK(Dart_CurrentIsolate() == nullptr);
+    FML_DCHECK(Dart_CurrentIsolate() == nullptr);
     Dart_EnterIsolate(vm_isolate);
     Dart_ShutdownIsolate();
-    FXL_DCHECK(Dart_CurrentIsolate() == nullptr);
+    FML_DCHECK(Dart_CurrentIsolate() == nullptr);
   }
   return true;
 }
@@ -574,7 +574,7 @@ Dart_Isolate DartIsolate::DartCreateAndStartServiceIsolate(
   const auto& settings = vm->GetSettings();
 
   if (!settings.enable_observatory) {
-    FXL_DLOG(INFO) << "Observatory is disabled.";
+    FML_DLOG(INFO) << "Observatory is disabled.";
     return nullptr;
   }
 
@@ -604,7 +604,7 @@ Dart_Isolate DartIsolate::DartCreateAndStartServiceIsolate(
   std::shared_ptr<DartIsolate> service_isolate = weak_service_isolate.lock();
   if (!service_isolate) {
     *error = strdup("Could not create the service isolate.");
-    FXL_DLOG(ERROR) << *error;
+    FML_DLOG(ERROR) << *error;
     return nullptr;
   }
 
@@ -628,7 +628,7 @@ Dart_Isolate DartIsolate::DartCreateAndStartServiceIsolate(
           error   // error (out)
           )) {
     // Error is populated by call to startup.
-    FXL_DLOG(ERROR) << *error;
+    FML_DLOG(ERROR) << *error;
     return nullptr;
   }
 
@@ -694,7 +694,7 @@ DartIsolate::CreateDartVMAndEmbedderObjectPair(
       (*embedder_isolate)->GetDartVM() == nullptr) {
     *error =
         strdup("Parent isolate did not have embedder specific callback data.");
-    FXL_DLOG(ERROR) << *error;
+    FML_DLOG(ERROR) << *error;
     return {nullptr, {}};
   }
 
@@ -762,20 +762,20 @@ DartIsolate::CreateDartVMAndEmbedderObjectPair(
                 flags, embedder_isolate.get(), error);
 
   if (isolate == nullptr) {
-    FXL_DLOG(ERROR) << *error;
+    FML_DLOG(ERROR) << *error;
     return {nullptr, {}};
   }
 
   if (!(*embedder_isolate)->Initialize(isolate, is_root_isolate)) {
     *error = strdup("Embedder could not initialize the Dart isolate.");
-    FXL_DLOG(ERROR) << *error;
+    FML_DLOG(ERROR) << *error;
     return {nullptr, {}};
   }
 
   if (!(*embedder_isolate)->LoadLibraries(is_root_isolate)) {
     *error =
         strdup("Embedder could not load libraries in the new Dart isolate.");
-    FXL_DLOG(ERROR) << *error;
+    FML_DLOG(ERROR) << *error;
     return {nullptr, {}};
   }
 
@@ -785,11 +785,11 @@ DartIsolate::CreateDartVMAndEmbedderObjectPair(
   // also a root isolate) by the utility routines in the VM. However, secondary
   // isolates will be run by the VM if they are marked as runnable.
   if (!is_root_isolate) {
-    FXL_DCHECK((*embedder_isolate)->child_isolate_preparer_);
+    FML_DCHECK((*embedder_isolate)->child_isolate_preparer_);
     if (!(*embedder_isolate)
              ->child_isolate_preparer_((*embedder_isolate).get())) {
       *error = strdup("Could not prepare the child isolate to run.");
-      FXL_DLOG(ERROR) << *error;
+      FML_DLOG(ERROR) << *error;
       return {nullptr, {}};
     }
   }
@@ -808,10 +808,10 @@ void DartIsolate::DartIsolateShutdownCallback(
   }
 
   tonic::DartApiScope api_scope;
-  FXL_LOG(ERROR) << "Isolate " << tonic::StdStringFromDart(Dart_DebugName())
+  FML_LOG(ERROR) << "Isolate " << tonic::StdStringFromDart(Dart_DebugName())
                  << " exited with an error";
   Dart_Handle sticky_error = Dart_GetStickyError();
-  FXL_CHECK(tonic::LogIfError(sticky_error));
+  FML_CHECK(tonic::LogIfError(sticky_error));
 }
 
 // |Dart_IsolateCleanupCallback|
@@ -820,11 +820,11 @@ void DartIsolate::DartIsolateCleanupCallback(
   delete embedder_isolate;
 }
 
-fxl::RefPtr<DartSnapshot> DartIsolate::GetIsolateSnapshot() const {
+fml::RefPtr<DartSnapshot> DartIsolate::GetIsolateSnapshot() const {
   return isolate_snapshot_;
 }
 
-fxl::RefPtr<DartSnapshot> DartIsolate::GetSharedSnapshot() const {
+fml::RefPtr<DartSnapshot> DartIsolate::GetSharedSnapshot() const {
   return shared_snapshot_;
 }
 
@@ -832,7 +832,7 @@ std::weak_ptr<DartIsolate> DartIsolate::GetWeakIsolatePtr() {
   return std::static_pointer_cast<DartIsolate>(shared_from_this());
 }
 
-void DartIsolate::AddIsolateShutdownCallback(fxl::Closure closure) {
+void DartIsolate::AddIsolateShutdownCallback(fml::closure closure) {
   shutdown_callbacks_.emplace_back(
       std::make_unique<AutoFireClosure>(std::move(closure)));
 }
diff --git a/runtime/dart_isolate.h b/runtime/dart_isolate.h
index b19c59fcd0084ddcfb0447d9c9063dce4bde63c9..df9a9f66d1b46e5256cb3907721cb562299efcdd 100644
--- a/runtime/dart_isolate.h
+++ b/runtime/dart_isolate.h
@@ -9,12 +9,12 @@
 #include <string>
 
 #include "flutter/common/task_runners.h"
+#include "flutter/fml/compiler_specific.h"
+#include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
 #include "flutter/lib/ui/ui_dart_state.h"
 #include "flutter/lib/ui/window/window.h"
 #include "flutter/runtime/dart_snapshot.h"
-#include "lib/fxl/compiler_specific.h"
-#include "lib/fxl/macros.h"
 #include "third_party/dart/runtime/include/dart_api.h"
 #include "third_party/tonic/dart_state.h"
 
@@ -40,22 +40,22 @@ class DartIsolate : public UIDartState {
   // way.
   static std::weak_ptr<DartIsolate> CreateRootIsolate(
       DartVM* vm,
-      fxl::RefPtr<DartSnapshot> isolate_snapshot,
-      fxl::RefPtr<DartSnapshot> shared_snapshot,
+      fml::RefPtr<DartSnapshot> isolate_snapshot,
+      fml::RefPtr<DartSnapshot> shared_snapshot,
       TaskRunners task_runners,
       std::unique_ptr<Window> window,
       fml::WeakPtr<GrContext> resource_context,
-      fxl::RefPtr<flow::SkiaUnrefQueue> unref_queue,
+      fml::RefPtr<flow::SkiaUnrefQueue> unref_queue,
       std::string advisory_script_uri,
       std::string advisory_script_entrypoint,
       Dart_IsolateFlags* flags = nullptr);
 
   DartIsolate(DartVM* vm,
-              fxl::RefPtr<DartSnapshot> isolate_snapshot,
-              fxl::RefPtr<DartSnapshot> shared_snapshot,
+              fml::RefPtr<DartSnapshot> isolate_snapshot,
+              fml::RefPtr<DartSnapshot> shared_snapshot,
               TaskRunners task_runners,
               fml::WeakPtr<GrContext> resource_context,
-              fxl::RefPtr<flow::SkiaUnrefQueue> unref_queue,
+              fml::RefPtr<flow::SkiaUnrefQueue> unref_queue,
               std::string advisory_script_uri,
               std::string advisory_script_entrypoint,
               ChildIsolatePreparer child_isolate_preparer);
@@ -64,34 +64,34 @@ class DartIsolate : public UIDartState {
 
   Phase GetPhase() const;
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool PrepareForRunningFromPrecompiledCode();
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool PrepareForRunningFromSnapshot(
       std::shared_ptr<const fml::Mapping> snapshot,
       bool last_piece = true);
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool PrepareForRunningFromSource(const std::string& main_source_file,
                                    const std::string& packages);
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool Run(const std::string& entrypoint);
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool RunFromLibrary(const std::string& library_name,
                       const std::string& entrypoint);
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool Shutdown();
 
-  void AddIsolateShutdownCallback(fxl::Closure closure);
+  void AddIsolateShutdownCallback(fml::closure closure);
 
   DartVM* GetDartVM() const;
 
-  fxl::RefPtr<DartSnapshot> GetIsolateSnapshot() const;
-  fxl::RefPtr<DartSnapshot> GetSharedSnapshot() const;
+  fml::RefPtr<DartSnapshot> GetIsolateSnapshot() const;
+  fml::RefPtr<DartSnapshot> GetSharedSnapshot() const;
 
   std::weak_ptr<DartIsolate> GetWeakIsolatePtr();
 
@@ -105,7 +105,7 @@ class DartIsolate : public UIDartState {
 
   class AutoFireClosure {
    public:
-    AutoFireClosure(fxl::Closure closure) : closure_(std::move(closure)) {}
+    AutoFireClosure(fml::closure closure) : closure_(std::move(closure)) {}
     ~AutoFireClosure() {
       if (closure_) {
         closure_();
@@ -113,28 +113,28 @@ class DartIsolate : public UIDartState {
     }
 
    private:
-    fxl::Closure closure_;
-    FXL_DISALLOW_COPY_AND_ASSIGN(AutoFireClosure);
+    fml::closure closure_;
+    FML_DISALLOW_COPY_AND_ASSIGN(AutoFireClosure);
   };
   friend class DartVM;
 
   DartVM* const vm_ = nullptr;
   Phase phase_ = Phase::Unknown;
-  const fxl::RefPtr<DartSnapshot> isolate_snapshot_;
-  const fxl::RefPtr<DartSnapshot> shared_snapshot_;
+  const fml::RefPtr<DartSnapshot> isolate_snapshot_;
+  const fml::RefPtr<DartSnapshot> shared_snapshot_;
   std::vector<std::shared_ptr<const fml::Mapping>> kernel_buffers_;
   std::vector<std::unique_ptr<AutoFireClosure>> shutdown_callbacks_;
   ChildIsolatePreparer child_isolate_preparer_;
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool Initialize(Dart_Isolate isolate, bool is_root_isolate);
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool LoadLibraries(bool is_root_isolate);
 
   bool UpdateThreadPoolNames() const;
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool MarkIsolateRunnable();
 
   // |Dart_IsolateCreateCallback|
@@ -175,7 +175,7 @@ class DartIsolate : public UIDartState {
   static void DartIsolateCleanupCallback(
       std::shared_ptr<DartIsolate>* embedder_isolate);
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(DartIsolate);
+  FML_DISALLOW_COPY_AND_ASSIGN(DartIsolate);
 };
 
 }  // namespace blink
diff --git a/runtime/dart_isolate_unittests.cc b/runtime/dart_isolate_unittests.cc
index 8a0de50acca0fb1083613e92839b1040395a3d2b..02cbbaf8cf5f227f4f16d0301e58911002bddd8c 100644
--- a/runtime/dart_isolate_unittests.cc
+++ b/runtime/dart_isolate_unittests.cc
@@ -19,7 +19,7 @@ using DartIsolateTest = ::testing::ThreadTest;
 
 TEST_F(DartIsolateTest, RootIsolateCreationAndShutdown) {
   Settings settings = {};
-  settings.task_observer_add = [](intptr_t, fxl::Closure) {};
+  settings.task_observer_add = [](intptr_t, fml::closure) {};
   settings.task_observer_remove = [](intptr_t) {};
   auto vm = DartVM::ForProcess(settings);
   ASSERT_TRUE(vm);
@@ -48,7 +48,7 @@ TEST_F(DartIsolateTest, RootIsolateCreationAndShutdown) {
 
 TEST_F(DartIsolateTest, IsolateCanAssociateSnapshot) {
   Settings settings = {};
-  settings.task_observer_add = [](intptr_t, fxl::Closure) {};
+  settings.task_observer_add = [](intptr_t, fml::closure) {};
   settings.task_observer_remove = [](intptr_t) {};
   auto vm = DartVM::ForProcess(settings);
   ASSERT_TRUE(vm);
@@ -80,7 +80,7 @@ TEST_F(DartIsolateTest, IsolateCanAssociateSnapshot) {
 
 TEST_F(DartIsolateTest, CanResolveAndInvokeMethod) {
   Settings settings = {};
-  settings.task_observer_add = [](intptr_t, fxl::Closure) {};
+  settings.task_observer_add = [](intptr_t, fml::closure) {};
   settings.task_observer_remove = [](intptr_t) {};
   auto vm = DartVM::ForProcess(settings);
   ASSERT_TRUE(vm);
diff --git a/runtime/dart_service_isolate.cc b/runtime/dart_service_isolate.cc
index 212b880687325dca4679858a76f3dadfa3963428..d1a699869959a161af7e60276366d699da4f2f6c 100644
--- a/runtime/dart_service_isolate.cc
+++ b/runtime/dart_service_isolate.cc
@@ -6,8 +6,8 @@
 
 #include <string.h>
 
+#include "flutter/fml/logging.h"
 #include "flutter/runtime/embedder_resources.h"
-#include "lib/fxl/logging.h"
 #include "third_party/dart/runtime/include/dart_api.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_library_natives.h"
@@ -46,12 +46,12 @@ static std::string observatory_uri_;
 Dart_NativeFunction GetNativeFunction(Dart_Handle name,
                                       int argument_count,
                                       bool* auto_setup_scope) {
-  FXL_CHECK(g_natives);
+  FML_CHECK(g_natives);
   return g_natives->GetNativeFunction(name, argument_count, auto_setup_scope);
 }
 
 const uint8_t* GetSymbol(Dart_NativeFunction native_function) {
-  FXL_CHECK(g_natives);
+  FML_CHECK(g_natives);
   return g_natives->GetSymbol(native_function);
 }
 
@@ -59,9 +59,9 @@ const uint8_t* GetSymbol(Dart_NativeFunction native_function) {
 
 void DartServiceIsolate::TriggerResourceLoad(Dart_NativeArguments args) {
   Dart_Handle library = Dart_RootLibrary();
-  FXL_DCHECK(!Dart_IsError(library));
+  FML_DCHECK(!Dart_IsError(library));
   Dart_Handle result = LoadResources(library);
-  FXL_DCHECK(!Dart_IsError(result));
+  FML_DCHECK(!Dart_IsError(result));
 }
 
 void DartServiceIsolate::NotifyServerState(Dart_NativeArguments args) {
@@ -88,11 +88,11 @@ bool DartServiceIsolate::Startup(std::string server_ip,
                                  bool disable_origin_check,
                                  char** error) {
   Dart_Isolate isolate = Dart_CurrentIsolate();
-  FXL_CHECK(isolate);
+  FML_CHECK(isolate);
 
   // Remember the embedder's library tag handler.
   g_embedder_tag_handler = embedder_tag_handler;
-  FXL_CHECK(g_embedder_tag_handler);
+  FML_CHECK(g_embedder_tag_handler);
 
   // Setup native entries.
   if (!g_natives) {
@@ -115,7 +115,7 @@ bool DartServiceIsolate::Startup(std::string server_ip,
     Dart_SetLibraryTagHandler(DartServiceIsolate::LibraryTagHandler);
     // Load main script.
     Dart_Handle library = LoadScript(kServiceIsolateScript);
-    FXL_DCHECK(library != Dart_Null());
+    FML_DCHECK(library != Dart_Null());
     SHUTDOWN_ON_ERROR(library);
     // Setup native entry resolution.
     result = Dart_SetNativeResolver(library, GetNativeFunction, GetSymbol);
@@ -181,7 +181,7 @@ Dart_Handle DartServiceIsolate::GetSource(const char* name) {
            name);
   const char* vmservice_source = NULL;
   int r = g_resources->ResourceLookup(buffer, &vmservice_source);
-  FXL_DCHECK(r != EmbedderResources::kNoSuchInstance);
+  FML_DCHECK(r != EmbedderResources::kNoSuchInstance);
   return Dart_NewStringFromCString(vmservice_source);
 }
 
@@ -206,7 +206,7 @@ Dart_Handle DartServiceIsolate::LoadResource(Dart_Handle library,
   const char* data_buffer = NULL;
   int data_buffer_length =
       g_resources->ResourceLookup(resource_name, &data_buffer);
-  FXL_DCHECK(data_buffer_length != EmbedderResources::kNoSuchInstance);
+  FML_DCHECK(data_buffer_length != EmbedderResources::kNoSuchInstance);
   Dart_Handle data_list =
       Dart_NewTypedData(Dart_TypedData_kUint8, data_buffer_length);
   RETURN_ERROR_HANDLE(data_list);
@@ -216,9 +216,9 @@ Dart_Handle DartServiceIsolate::LoadResource(Dart_Handle library,
   Dart_Handle result = Dart_TypedDataAcquireData(
       data_list, &type, &data_list_buffer, &data_list_buffer_length);
   RETURN_ERROR_HANDLE(result);
-  FXL_DCHECK(data_buffer_length == data_list_buffer_length);
-  FXL_DCHECK(data_list_buffer != NULL);
-  FXL_DCHECK(type = Dart_TypedData_kUint8);
+  FML_DCHECK(data_buffer_length == data_list_buffer_length);
+  FML_DCHECK(data_list_buffer != NULL);
+  FML_DCHECK(type = Dart_TypedData_kUint8);
   memmove(data_list_buffer, &data_buffer[0], data_buffer_length);
   result = Dart_TypedDataReleaseData(data_list);
   RETURN_ERROR_HANDLE(result);
@@ -272,7 +272,7 @@ Dart_Handle DartServiceIsolate::LibraryTagHandler(Dart_LibraryTag tag,
     // Embedder handles all requests for external libraries.
     return g_embedder_tag_handler(tag, library, url);
   }
-  FXL_DCHECK((tag == Dart_kSourceTag) || (tag == Dart_kCanonicalizeUrl));
+  FML_DCHECK((tag == Dart_kSourceTag) || (tag == Dart_kCanonicalizeUrl));
   if (tag == Dart_kCanonicalizeUrl) {
     // url is already canonicalized.
     return url;
diff --git a/runtime/dart_snapshot.cc b/runtime/dart_snapshot.cc
index 1545b8880e432fef85dd43a3e4bc5864afc17d93..3c8f519439a9f2d36da7cedfa50c04175c3b90fa 100644
--- a/runtime/dart_snapshot.cc
+++ b/runtime/dart_snapshot.cc
@@ -33,9 +33,12 @@ const char* DartSnapshot::kIsolateInstructionsSymbol =
 #endif
 
 static const char* kVMDataSymbolSo = SYMBOL_PREFIX "kDartVmSnapshotData";
-static const char* kVMInstructionsSymbolSo = SYMBOL_PREFIX "kDartVmSnapshotInstructions";
-static const char* kIsolateDataSymbolSo = SYMBOL_PREFIX "kDartIsolateSnapshotData";
-static const char* kIsolateInstructionsSymbolSo = SYMBOL_PREFIX "kDartIsolateSnapshotInstructions";
+static const char* kVMInstructionsSymbolSo =
+    SYMBOL_PREFIX "kDartVmSnapshotInstructions";
+static const char* kIsolateDataSymbolSo =
+    SYMBOL_PREFIX "kDartIsolateSnapshotData";
+static const char* kIsolateInstructionsSymbolSo =
+    SYMBOL_PREFIX "kDartIsolateSnapshotInstructions";
 
 std::unique_ptr<DartSnapshotBuffer> ResolveVMData(const Settings& settings) {
   if (settings.vm_snapshot_data_path.size() > 0) {
@@ -46,9 +49,10 @@ std::unique_ptr<DartSnapshotBuffer> ResolveVMData(const Settings& settings) {
   }
 
   if (settings.application_library_path.size() > 0) {
-    auto shared_library = fml::NativeLibrary::Create(settings.application_library_path.c_str());
+    auto shared_library =
+        fml::NativeLibrary::Create(settings.application_library_path.c_str());
     if (auto source = DartSnapshotBuffer::CreateWithSymbolInLibrary(
-        shared_library, kVMDataSymbolSo)) {
+            shared_library, kVMDataSymbolSo)) {
       return source;
     }
   }
@@ -129,17 +133,17 @@ std::unique_ptr<DartSnapshotBuffer> ResolveIsolateInstructions(
       loaded_process, DartSnapshot::kIsolateInstructionsSymbol);
 }
 
-fxl::RefPtr<DartSnapshot> DartSnapshot::VMSnapshotFromSettings(
+fml::RefPtr<DartSnapshot> DartSnapshot::VMSnapshotFromSettings(
     const Settings& settings) {
   TRACE_EVENT0("flutter", "DartSnapshot::VMSnapshotFromSettings");
 #if OS_WIN
-  return fxl::MakeRefCounted<DartSnapshot>(
+  return fml::MakeRefCounted<DartSnapshot>(
       DartSnapshotBuffer::CreateWithUnmanagedAllocation(kDartVmSnapshotData),
       DartSnapshotBuffer::CreateWithUnmanagedAllocation(
           kDartVmSnapshotInstructions));
 #else   // OS_WIN
   auto snapshot =
-      fxl::MakeRefCounted<DartSnapshot>(ResolveVMData(settings),         //
+      fml::MakeRefCounted<DartSnapshot>(ResolveVMData(settings),         //
                                         ResolveVMInstructions(settings)  //
       );
   if (snapshot->IsValid()) {
@@ -149,18 +153,18 @@ fxl::RefPtr<DartSnapshot> DartSnapshot::VMSnapshotFromSettings(
 #endif  // OS_WIN
 }
 
-fxl::RefPtr<DartSnapshot> DartSnapshot::IsolateSnapshotFromSettings(
+fml::RefPtr<DartSnapshot> DartSnapshot::IsolateSnapshotFromSettings(
     const Settings& settings) {
   TRACE_EVENT0("flutter", "DartSnapshot::IsolateSnapshotFromSettings");
 #if OS_WIN
-  return fxl::MakeRefCounted<DartSnapshot>(
+  return fml::MakeRefCounted<DartSnapshot>(
       DartSnapshotBuffer::CreateWithUnmanagedAllocation(
           kDartIsolateSnapshotData),
       DartSnapshotBuffer::CreateWithUnmanagedAllocation(
           kDartIsolateSnapshotInstructions));
 #else  // OS_WIN
   auto snapshot =
-      fxl::MakeRefCounted<DartSnapshot>(ResolveIsolateData(settings),         //
+      fml::MakeRefCounted<DartSnapshot>(ResolveIsolateData(settings),         //
                                         ResolveIsolateInstructions(settings)  //
       );
   if (snapshot->IsValid()) {
@@ -170,8 +174,8 @@ fxl::RefPtr<DartSnapshot> DartSnapshot::IsolateSnapshotFromSettings(
 #endif
 }
 
-fxl::RefPtr<DartSnapshot> DartSnapshot::Empty() {
-  return fxl::MakeRefCounted<DartSnapshot>(nullptr, nullptr);
+fml::RefPtr<DartSnapshot> DartSnapshot::Empty() {
+  return fml::MakeRefCounted<DartSnapshot>(nullptr, nullptr);
 }
 
 DartSnapshot::DartSnapshot(std::unique_ptr<DartSnapshotBuffer> data,
diff --git a/runtime/dart_snapshot.h b/runtime/dart_snapshot.h
index dfc5001dc99ff4eef33b8d00cd966ad44684b04b..c8aa17c3140ab52635d60e659d9f8e8e4acbe09a 100644
--- a/runtime/dart_snapshot.h
+++ b/runtime/dart_snapshot.h
@@ -9,26 +9,26 @@
 #include <string>
 
 #include "flutter/common/settings.h"
+#include "flutter/fml/macros.h"
+#include "flutter/fml/memory/ref_counted.h"
 #include "flutter/runtime/dart_snapshot_buffer.h"
-#include "lib/fxl/macros.h"
-#include "lib/fxl/memory/ref_counted.h"
 
 namespace blink {
 
-class DartSnapshot : public fxl::RefCountedThreadSafe<DartSnapshot> {
+class DartSnapshot : public fml::RefCountedThreadSafe<DartSnapshot> {
  public:
   static const char* kVMDataSymbol;
   static const char* kVMInstructionsSymbol;
   static const char* kIsolateDataSymbol;
   static const char* kIsolateInstructionsSymbol;
 
-  static fxl::RefPtr<DartSnapshot> VMSnapshotFromSettings(
+  static fml::RefPtr<DartSnapshot> VMSnapshotFromSettings(
       const Settings& settings);
 
-  static fxl::RefPtr<DartSnapshot> IsolateSnapshotFromSettings(
+  static fml::RefPtr<DartSnapshot> IsolateSnapshotFromSettings(
       const Settings& settings);
 
-  static fxl::RefPtr<DartSnapshot> Empty();
+  static fml::RefPtr<DartSnapshot> Empty();
 
   bool IsValid() const;
 
@@ -51,9 +51,9 @@ class DartSnapshot : public fxl::RefCountedThreadSafe<DartSnapshot> {
 
   ~DartSnapshot();
 
-  FRIEND_REF_COUNTED_THREAD_SAFE(DartSnapshot);
-  FRIEND_MAKE_REF_COUNTED(DartSnapshot);
-  FXL_DISALLOW_COPY_AND_ASSIGN(DartSnapshot);
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(DartSnapshot);
+  FML_FRIEND_MAKE_REF_COUNTED(DartSnapshot);
+  FML_DISALLOW_COPY_AND_ASSIGN(DartSnapshot);
 };
 
 }  // namespace blink
diff --git a/runtime/dart_snapshot_buffer.cc b/runtime/dart_snapshot_buffer.cc
index c18c80e35b884e101b965dc9650f76cf54d9f069..125447e59bb78dd23b60dd86eac0aa39c13a65d9 100644
--- a/runtime/dart_snapshot_buffer.cc
+++ b/runtime/dart_snapshot_buffer.cc
@@ -12,7 +12,7 @@ namespace blink {
 
 class NativeLibrarySnapshotBuffer final : public DartSnapshotBuffer {
  public:
-  NativeLibrarySnapshotBuffer(fxl::RefPtr<fml::NativeLibrary> library,
+  NativeLibrarySnapshotBuffer(fml::RefPtr<fml::NativeLibrary> library,
                               const char* symbol_name)
       : library_(std::move(library)) {
     if (library_) {
@@ -25,10 +25,10 @@ class NativeLibrarySnapshotBuffer final : public DartSnapshotBuffer {
   size_t GetSnapshotSize() const override { return 0; }
 
  private:
-  fxl::RefPtr<fml::NativeLibrary> library_;
+  fml::RefPtr<fml::NativeLibrary> library_;
   const uint8_t* symbol_ = nullptr;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(NativeLibrarySnapshotBuffer);
+  FML_DISALLOW_COPY_AND_ASSIGN(NativeLibrarySnapshotBuffer);
 };
 
 class FileSnapshotBuffer final : public DartSnapshotBuffer {
@@ -48,7 +48,7 @@ class FileSnapshotBuffer final : public DartSnapshotBuffer {
   fml::FileMapping mapping_;
   const uint8_t* symbol_ = nullptr;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(FileSnapshotBuffer);
+  FML_DISALLOW_COPY_AND_ASSIGN(FileSnapshotBuffer);
 };
 
 class UnmanagedAllocation final : public DartSnapshotBuffer {
@@ -62,12 +62,12 @@ class UnmanagedAllocation final : public DartSnapshotBuffer {
  private:
   const uint8_t* allocation_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(UnmanagedAllocation);
+  FML_DISALLOW_COPY_AND_ASSIGN(UnmanagedAllocation);
 };
 
 std::unique_ptr<DartSnapshotBuffer>
 DartSnapshotBuffer::CreateWithSymbolInLibrary(
-    fxl::RefPtr<fml::NativeLibrary> library,
+    fml::RefPtr<fml::NativeLibrary> library,
     const char* symbol_name) {
   auto source = std::make_unique<NativeLibrarySnapshotBuffer>(
       std::move(library), symbol_name);
diff --git a/runtime/dart_snapshot_buffer.h b/runtime/dart_snapshot_buffer.h
index 8367b658dfdf08fe6d741e380c06bb7e93414aad..fec92c6820c147071ef120aabc38c1b71a8fc8e8 100644
--- a/runtime/dart_snapshot_buffer.h
+++ b/runtime/dart_snapshot_buffer.h
@@ -7,15 +7,15 @@
 
 #include <memory>
 
+#include "flutter/fml/macros.h"
 #include "flutter/fml/native_library.h"
-#include "lib/fxl/macros.h"
 
 namespace blink {
 
 class DartSnapshotBuffer {
  public:
   static std::unique_ptr<DartSnapshotBuffer> CreateWithSymbolInLibrary(
-      fxl::RefPtr<fml::NativeLibrary> library,
+      fml::RefPtr<fml::NativeLibrary> library,
       const char* symbol_name);
 
   static std::unique_ptr<DartSnapshotBuffer> CreateWithContentsOfFile(
diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc
index 072502ef7a92d6416c7d52b0e2671d081720ac12..3687303f4ae67363db2aaec7bc68a7e511ecc5fb 100644
--- a/runtime/dart_vm.cc
+++ b/runtime/dart_vm.cc
@@ -10,6 +10,11 @@
 #include <vector>
 
 #include "flutter/common/settings.h"
+#include "flutter/fml/arraysize.h"
+#include "flutter/fml/compiler_specific.h"
+#include "flutter/fml/file.h"
+#include "flutter/fml/logging.h"
+#include "flutter/fml/time/time_delta.h"
 #include "flutter/fml/trace_event.h"
 #include "flutter/lib/io/dart_io.h"
 #include "flutter/lib/ui/dart_runtime_hooks.h"
@@ -17,11 +22,6 @@
 #include "flutter/runtime/dart_isolate.h"
 #include "flutter/runtime/dart_service_isolate.h"
 #include "flutter/runtime/start_up.h"
-#include "lib/fxl/arraysize.h"
-#include "lib/fxl/compiler_specific.h"
-#include "lib/fxl/files/file.h"
-#include "lib/fxl/logging.h"
-#include "lib/fxl/time/time_delta.h"
 #include "third_party/dart/runtime/bin/embedded_dart_io.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_class_library.h"
@@ -72,7 +72,7 @@ static const char* kDartPrecompilationArgs[] = {
     "--precompilation",
 };
 
-FXL_ALLOW_UNUSED_TYPE
+FML_ALLOW_UNUSED_TYPE
 static const char* kDartWriteProtectCodeArgs[] = {
     "--no_write_protect_code",
 };
@@ -111,7 +111,7 @@ static const char* kDartEndlessTraceBufferArgs[]{
     "--timeline_recorder=endless",
 };
 
-static const char* kDartFuchsiaTraceArgs[] FXL_ALLOW_UNUSED_TYPE = {
+static const char* kDartFuchsiaTraceArgs[] FML_ALLOW_UNUSED_TYPE = {
     "--systrace_timeline",
     "--timeline_streams=Compiler,Dart,Debugger,Embedder,GC,Isolate,VM",
 };
@@ -142,8 +142,8 @@ bool DartFileModifiedCallback(const char* source_url, int64_t since_ms) {
   // We add one to st_mtime because st_mtime has less precision than since_ms
   // and we want to treat the file as modified if the since time is between
   // ticks of the mtime.
-  fxl::TimeDelta mtime = fxl::TimeDelta::FromSeconds(info.st_mtime + 1);
-  fxl::TimeDelta since = fxl::TimeDelta::FromMilliseconds(since_ms);
+  fml::TimeDelta mtime = fml::TimeDelta::FromSeconds(info.st_mtime + 1);
+  fml::TimeDelta since = fml::TimeDelta::FromMilliseconds(since_ms);
 
   return mtime > since;
 }
@@ -158,7 +158,7 @@ Dart_Handle GetVMServiceAssetsArchiveCallback() {
   std::vector<uint8_t> observatory_assets_archive;
   if (!files::ReadFileToVector("pkg/data/observatory.tar",
                                &observatory_assets_archive)) {
-    FXL_LOG(ERROR) << "Fail to load Observatory archive";
+    FML_LOG(ERROR) << "Fail to load Observatory archive";
     return nullptr;
   }
   return tonic::DartConverter<tonic::Uint8List>::ToDart(
@@ -232,18 +232,18 @@ static void EmbedderInformationCallback(Dart_EmbedderInformation* info) {
   info->name = "Flutter";
 }
 
-fxl::RefPtr<DartVM> DartVM::ForProcess(Settings settings) {
+fml::RefPtr<DartVM> DartVM::ForProcess(Settings settings) {
   return ForProcess(settings, nullptr, nullptr, nullptr);
 }
 
 static std::once_flag gVMInitialization;
-static fxl::RefPtr<DartVM> gVM;
+static fml::RefPtr<DartVM> gVM;
 
-fxl::RefPtr<DartVM> DartVM::ForProcess(
+fml::RefPtr<DartVM> DartVM::ForProcess(
     Settings settings,
-    fxl::RefPtr<DartSnapshot> vm_snapshot,
-    fxl::RefPtr<DartSnapshot> isolate_snapshot,
-    fxl::RefPtr<DartSnapshot> shared_snapshot) {
+    fml::RefPtr<DartSnapshot> vm_snapshot,
+    fml::RefPtr<DartSnapshot> isolate_snapshot,
+    fml::RefPtr<DartSnapshot> shared_snapshot) {
   std::call_once(gVMInitialization, [settings,          //
                                      vm_snapshot,       //
                                      isolate_snapshot,  //
@@ -253,20 +253,20 @@ fxl::RefPtr<DartVM> DartVM::ForProcess(
       vm_snapshot = DartSnapshot::VMSnapshotFromSettings(settings);
     }
     if (!(vm_snapshot && vm_snapshot->IsValid())) {
-      FXL_LOG(ERROR) << "VM snapshot must be valid.";
+      FML_LOG(ERROR) << "VM snapshot must be valid.";
       return;
     }
     if (!isolate_snapshot) {
       isolate_snapshot = DartSnapshot::IsolateSnapshotFromSettings(settings);
     }
     if (!(isolate_snapshot && isolate_snapshot->IsValid())) {
-      FXL_LOG(ERROR) << "Isolate snapshot must be valid.";
+      FML_LOG(ERROR) << "Isolate snapshot must be valid.";
       return;
     }
     if (!shared_snapshot) {
       shared_snapshot = DartSnapshot::Empty();
     }
-    gVM = fxl::MakeRefCounted<DartVM>(settings,                     //
+    gVM = fml::MakeRefCounted<DartVM>(settings,                     //
                                       std::move(vm_snapshot),       //
                                       std::move(isolate_snapshot),  //
                                       std::move(shared_snapshot)    //
@@ -275,14 +275,14 @@ fxl::RefPtr<DartVM> DartVM::ForProcess(
   return gVM;
 }
 
-fxl::RefPtr<DartVM> DartVM::ForProcessIfInitialized() {
+fml::RefPtr<DartVM> DartVM::ForProcessIfInitialized() {
   return gVM;
 }
 
 DartVM::DartVM(const Settings& settings,
-               fxl::RefPtr<DartSnapshot> vm_snapshot,
-               fxl::RefPtr<DartSnapshot> isolate_snapshot,
-               fxl::RefPtr<DartSnapshot> shared_snapshot)
+               fml::RefPtr<DartSnapshot> vm_snapshot,
+               fml::RefPtr<DartSnapshot> isolate_snapshot,
+               fml::RefPtr<DartSnapshot> shared_snapshot)
     : settings_(settings),
       vm_snapshot_(std::move(vm_snapshot)),
       isolate_snapshot_(std::move(isolate_snapshot)),
@@ -291,7 +291,7 @@ DartVM::DartVM(const Settings& settings,
           std::make_unique<fml::FileMapping>(settings.platform_kernel_path)),
       weak_factory_(this) {
   TRACE_EVENT0("flutter", "DartVMInitializer");
-  FXL_DLOG(INFO) << "Attempting Dart VM launch for mode: "
+  FML_DLOG(INFO) << "Attempting Dart VM launch for mode: "
                  << (IsRunningPrecompiledCode() ? "AOT" : "Interpreter");
 
   {
@@ -351,7 +351,7 @@ DartVM::DartVM(const Settings& settings,
   const bool is_preview_dart2 =
       (platform_kernel_mapping_->GetSize() > 0) || isolate_snapshot_is_dart_2;
 
-  FXL_DLOG(INFO) << "Dart 2 " << (is_preview_dart2 ? "is" : "is NOT")
+  FML_DLOG(INFO) << "Dart 2 " << (is_preview_dart2 ? "is" : "is NOT")
                  << " enabled. Platform kernel: "
                  << static_cast<bool>(platform_kernel_mapping_->GetSize() > 0)
                  << " Isolate Snapshot is Dart 2: "
@@ -363,11 +363,11 @@ DartVM::DartVM(const Settings& settings,
       PushBackAll(&args, kDartAssertArgs, arraysize(kDartAssertArgs));
     }
   } else if (use_checked_mode) {
-    FXL_DLOG(INFO) << "Checked mode is ON";
+    FML_DLOG(INFO) << "Checked mode is ON";
     PushBackAll(&args, kDartAssertArgs, arraysize(kDartAssertArgs));
     PushBackAll(&args, kDartCheckedModeArgs, arraysize(kDartCheckedModeArgs));
   } else {
-    FXL_DLOG(INFO) << "Is not Dart 2 and Checked mode is OFF";
+    FML_DLOG(INFO) << "Is not Dart 2 and Checked mode is OFF";
   }
 
   if (settings.start_paused) {
@@ -394,7 +394,7 @@ DartVM::DartVM(const Settings& settings,
 
   char* flags_error = Dart_SetVMFlags(args.size(), args.data());
   if (flags_error) {
-    FXL_LOG(FATAL) << "Error while setting Dart VM flags: " << flags_error;
+    FML_LOG(FATAL) << "Error while setting Dart VM flags: " << flags_error;
     ::free(flags_error);
   }
 
@@ -419,7 +419,7 @@ DartVM::DartVM(const Settings& settings,
     params.entropy_source = DartIO::EntropySource;
     char* init_error = Dart_Initialize(&params);
     if (init_error) {
-      FXL_LOG(FATAL) << "Error while initializing the Dart VM: " << init_error;
+      FML_LOG(FATAL) << "Error while initializing the Dart VM: " << init_error;
       ::free(init_error);
     }
     // Send the earliest available timestamp in the application lifecycle to
@@ -452,7 +452,7 @@ DartVM::~DartVM() {
   }
   char* result = Dart_Cleanup();
   if (result != nullptr) {
-    FXL_LOG(ERROR) << "Could not cleanly shut down the Dart VM. Message: \""
+    FML_LOG(ERROR) << "Could not cleanly shut down the Dart VM. Message: \""
                    << result << "\".";
     free(result);
   }
@@ -474,11 +474,11 @@ IsolateNameServer* DartVM::GetIsolateNameServer() {
   return &isolate_name_server_;
 }
 
-fxl::RefPtr<DartSnapshot> DartVM::GetIsolateSnapshot() const {
+fml::RefPtr<DartSnapshot> DartVM::GetIsolateSnapshot() const {
   return isolate_snapshot_;
 }
 
-fxl::RefPtr<DartSnapshot> DartVM::GetSharedSnapshot() const {
+fml::RefPtr<DartSnapshot> DartVM::GetSharedSnapshot() const {
   return shared_snapshot_;
 }
 
@@ -486,7 +486,7 @@ ServiceProtocol& DartVM::GetServiceProtocol() {
   return service_protocol_;
 }
 
-fxl::WeakPtr<DartVM> DartVM::GetWeakPtr() {
+fml::WeakPtr<DartVM> DartVM::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
diff --git a/runtime/dart_vm.h b/runtime/dart_vm.h
index 8c2c6f3fe5019a7344d396e52ea02321eec98cb1..71ac0b1707d2d677271d8c317a37095f56681e7c 100644
--- a/runtime/dart_vm.h
+++ b/runtime/dart_vm.h
@@ -10,31 +10,31 @@
 #include <vector>
 
 #include "flutter/common/settings.h"
+#include "flutter/fml/build_config.h"
+#include "flutter/fml/closure.h"
+#include "flutter/fml/macros.h"
+#include "flutter/fml/memory/ref_counted.h"
+#include "flutter/fml/memory/ref_ptr.h"
+#include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/lib/ui/isolate_name_server/isolate_name_server.h"
 #include "flutter/runtime/dart_isolate.h"
 #include "flutter/runtime/dart_snapshot.h"
 #include "flutter/runtime/service_protocol.h"
-#include "lib/fxl/build_config.h"
-#include "lib/fxl/functional/closure.h"
-#include "lib/fxl/macros.h"
-#include "lib/fxl/memory/ref_counted.h"
-#include "lib/fxl/memory/ref_ptr.h"
-#include "lib/fxl/memory/weak_ptr.h"
 #include "third_party/dart/runtime/include/dart_api.h"
 
 namespace blink {
 
-class DartVM : public fxl::RefCountedThreadSafe<DartVM> {
+class DartVM : public fml::RefCountedThreadSafe<DartVM> {
  public:
-  static fxl::RefPtr<DartVM> ForProcess(Settings settings);
+  static fml::RefPtr<DartVM> ForProcess(Settings settings);
 
-  static fxl::RefPtr<DartVM> ForProcess(
+  static fml::RefPtr<DartVM> ForProcess(
       Settings settings,
-      fxl::RefPtr<DartSnapshot> vm_snapshot,
-      fxl::RefPtr<DartSnapshot> isolate_snapshot,
-      fxl::RefPtr<DartSnapshot> shared_snapshot);
+      fml::RefPtr<DartSnapshot> vm_snapshot,
+      fml::RefPtr<DartSnapshot> isolate_snapshot,
+      fml::RefPtr<DartSnapshot> shared_snapshot);
 
-  static fxl::RefPtr<DartVM> ForProcessIfInitialized();
+  static fml::RefPtr<DartVM> ForProcessIfInitialized();
 
   static bool IsRunningPrecompiledCode();
 
@@ -46,33 +46,33 @@ class DartVM : public fxl::RefCountedThreadSafe<DartVM> {
 
   IsolateNameServer* GetIsolateNameServer();
 
-  fxl::RefPtr<DartSnapshot> GetIsolateSnapshot() const;
-  fxl::RefPtr<DartSnapshot> GetSharedSnapshot() const;
+  fml::RefPtr<DartSnapshot> GetIsolateSnapshot() const;
+  fml::RefPtr<DartSnapshot> GetSharedSnapshot() const;
 
-  fxl::WeakPtr<DartVM> GetWeakPtr();
+  fml::WeakPtr<DartVM> GetWeakPtr();
 
   ServiceProtocol& GetServiceProtocol();
 
  private:
   const Settings settings_;
-  const fxl::RefPtr<DartSnapshot> vm_snapshot_;
+  const fml::RefPtr<DartSnapshot> vm_snapshot_;
   IsolateNameServer isolate_name_server_;
-  const fxl::RefPtr<DartSnapshot> isolate_snapshot_;
-  const fxl::RefPtr<DartSnapshot> shared_snapshot_;
+  const fml::RefPtr<DartSnapshot> isolate_snapshot_;
+  const fml::RefPtr<DartSnapshot> shared_snapshot_;
   std::unique_ptr<fml::Mapping> platform_kernel_mapping_;
   ServiceProtocol service_protocol_;
-  fxl::WeakPtrFactory<DartVM> weak_factory_;
+  fml::WeakPtrFactory<DartVM> weak_factory_;
 
   DartVM(const Settings& settings,
-         fxl::RefPtr<DartSnapshot> vm_snapshot,
-         fxl::RefPtr<DartSnapshot> isolate_snapshot,
-         fxl::RefPtr<DartSnapshot> shared_snapshot);
+         fml::RefPtr<DartSnapshot> vm_snapshot,
+         fml::RefPtr<DartSnapshot> isolate_snapshot,
+         fml::RefPtr<DartSnapshot> shared_snapshot);
 
   ~DartVM();
 
-  FRIEND_REF_COUNTED_THREAD_SAFE(DartVM);
-  FRIEND_MAKE_REF_COUNTED(DartVM);
-  FXL_DISALLOW_COPY_AND_ASSIGN(DartVM);
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(DartVM);
+  FML_FRIEND_MAKE_REF_COUNTED(DartVM);
+  FML_DISALLOW_COPY_AND_ASSIGN(DartVM);
 };
 
 }  // namespace blink
diff --git a/runtime/dart_vm_unittests.cc b/runtime/dart_vm_unittests.cc
index 280375dd19febc912be69bd88ed81104d24ce7b0..d0e247836410b2a297ac37527b6874d4661d5d73 100644
--- a/runtime/dart_vm_unittests.cc
+++ b/runtime/dart_vm_unittests.cc
@@ -9,7 +9,7 @@ namespace blink {
 
 TEST(DartVM, SimpleInitialization) {
   Settings settings = {};
-  settings.task_observer_add = [](intptr_t, fxl::Closure) {};
+  settings.task_observer_add = [](intptr_t, fml::closure) {};
   settings.task_observer_remove = [](intptr_t) {};
   auto vm = DartVM::ForProcess(settings);
   ASSERT_TRUE(vm);
@@ -20,7 +20,7 @@ TEST(DartVM, SimpleInitialization) {
 
 TEST(DartVM, SimpleIsolateNameServer) {
   Settings settings = {};
-  settings.task_observer_add = [](intptr_t, fxl::Closure) {};
+  settings.task_observer_add = [](intptr_t, fml::closure) {};
   settings.task_observer_remove = [](intptr_t) {};
   auto vm = DartVM::ForProcess(settings);
   auto ns = vm->GetIsolateNameServer();
diff --git a/runtime/embedder_resources.cc b/runtime/embedder_resources.cc
index 187dbaf81d1a1104e167736e51d9cf0871267fb0..102bdae7b3a00b25a94cae7307a14d48a76e6473 100644
--- a/runtime/embedder_resources.cc
+++ b/runtime/embedder_resources.cc
@@ -6,7 +6,7 @@
 
 #include <string.h>
 
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 
 namespace blink {
 
@@ -22,7 +22,7 @@ int EmbedderResources::ResourceLookup(const char* path, const char** resource) {
     const ResourcesEntry& entry = resources_table_[i];
     if (strcmp(path, entry.path_) == 0) {
       *resource = entry.resource_;
-      FXL_DCHECK(entry.length_ > 0);
+      FML_DCHECK(entry.length_ > 0);
       return entry.length_;
     }
   }
@@ -30,17 +30,17 @@ int EmbedderResources::ResourceLookup(const char* path, const char** resource) {
 }
 
 const char* EmbedderResources::Path(int idx) {
-  FXL_DCHECK(idx >= 0);
+  FML_DCHECK(idx >= 0);
   ResourcesEntry* entry = At(idx);
   if (entry == nullptr) {
     return nullptr;
   }
-  FXL_DCHECK(entry->path_ != nullptr);
+  FML_DCHECK(entry->path_ != nullptr);
   return entry->path_;
 }
 
 ResourcesEntry* EmbedderResources::At(int idx) {
-  FXL_DCHECK(idx >= 0);
+  FML_DCHECK(idx >= 0);
   for (int i = 0; resources_table_[i].path_ != nullptr; i++) {
     if (idx == i) {
       return &resources_table_[i];
diff --git a/runtime/runtime_controller.cc b/runtime/runtime_controller.cc
index c53375371b5f7f293394489b29e1e311af02a728..1b3f3387917489cc994e6d6dea101fbefa48d040 100644
--- a/runtime/runtime_controller.cc
+++ b/runtime/runtime_controller.cc
@@ -21,11 +21,11 @@ namespace blink {
 RuntimeController::RuntimeController(
     RuntimeDelegate& p_client,
     DartVM* p_vm,
-    fxl::RefPtr<DartSnapshot> p_isolate_snapshot,
-    fxl::RefPtr<DartSnapshot> p_shared_snapshot,
+    fml::RefPtr<DartSnapshot> p_isolate_snapshot,
+    fml::RefPtr<DartSnapshot> p_shared_snapshot,
     TaskRunners p_task_runners,
     fml::WeakPtr<GrContext> p_resource_context,
-    fxl::RefPtr<flow::SkiaUnrefQueue> p_unref_queue,
+    fml::RefPtr<flow::SkiaUnrefQueue> p_unref_queue,
     std::string p_advisory_script_uri,
     std::string p_advisory_script_entrypoint)
     : RuntimeController(p_client,
@@ -42,11 +42,11 @@ RuntimeController::RuntimeController(
 RuntimeController::RuntimeController(
     RuntimeDelegate& p_client,
     DartVM* p_vm,
-    fxl::RefPtr<DartSnapshot> p_isolate_snapshot,
-    fxl::RefPtr<DartSnapshot> p_shared_snapshot,
+    fml::RefPtr<DartSnapshot> p_isolate_snapshot,
+    fml::RefPtr<DartSnapshot> p_shared_snapshot,
     TaskRunners p_task_runners,
     fml::WeakPtr<GrContext> p_resource_context,
-    fxl::RefPtr<flow::SkiaUnrefQueue> p_unref_queue,
+    fml::RefPtr<flow::SkiaUnrefQueue> p_unref_queue,
     std::string p_advisory_script_uri,
     std::string p_advisory_script_entrypoint,
     WindowData p_window_data)
@@ -78,22 +78,22 @@ RuntimeController::RuntimeController(
     tonic::DartState::Scope scope(root_isolate);
     window->DidCreateIsolate();
     if (!FlushRuntimeStateToIsolate()) {
-      FXL_DLOG(ERROR) << "Could not setup intial isolate state.";
+      FML_DLOG(ERROR) << "Could not setup intial isolate state.";
     }
   } else {
-    FXL_DCHECK(false) << "RuntimeController created without window binding.";
+    FML_DCHECK(false) << "RuntimeController created without window binding.";
   }
-  FXL_DCHECK(Dart_CurrentIsolate() == nullptr);
+  FML_DCHECK(Dart_CurrentIsolate() == nullptr);
 }
 
 RuntimeController::~RuntimeController() {
-  FXL_DCHECK(Dart_CurrentIsolate() == nullptr);
+  FML_DCHECK(Dart_CurrentIsolate() == nullptr);
   std::shared_ptr<DartIsolate> root_isolate = root_isolate_.lock();
   if (root_isolate) {
     root_isolate->SetReturnCodeCallback(nullptr);
     auto result = root_isolate->Shutdown();
     if (!result) {
-      FXL_DLOG(ERROR) << "Could not shutdown the root isolate.";
+      FML_DLOG(ERROR) << "Could not shutdown the root isolate.";
     }
     root_isolate_ = {};
   }
@@ -186,7 +186,7 @@ bool RuntimeController::SetAssistiveTechnologyEnabled(bool enabled) {
   return false;
 }
 
-bool RuntimeController::BeginFrame(fxl::TimePoint frame_time) {
+bool RuntimeController::BeginFrame(fml::TimePoint frame_time) {
   if (auto window = GetWindowIfAvailable()) {
     window->BeginFrame(frame_time);
     return true;
@@ -206,7 +206,7 @@ bool RuntimeController::NotifyIdle(int64_t deadline) {
 }
 
 bool RuntimeController::DispatchPlatformMessage(
-    fxl::RefPtr<PlatformMessage> message) {
+    fml::RefPtr<PlatformMessage> message) {
   if (auto window = GetWindowIfAvailable()) {
     TRACE_EVENT1("flutter", "RuntimeController::DispatchPlatformMessage",
                  "mode", "basic");
@@ -263,7 +263,7 @@ void RuntimeController::UpdateSemantics(SemanticsUpdate* update) {
 }
 
 void RuntimeController::HandlePlatformMessage(
-    fxl::RefPtr<PlatformMessage> message) {
+    fml::RefPtr<PlatformMessage> message) {
   client_.HandlePlatformMessage(std::move(message));
 }
 
diff --git a/runtime/runtime_controller.h b/runtime/runtime_controller.h
index a2d32c097df1544f921f135e39be8eae75000a3e..637e9c68d1e2e18a1cda361ff4cd09dca5e82303 100644
--- a/runtime/runtime_controller.h
+++ b/runtime/runtime_controller.h
@@ -9,12 +9,12 @@
 
 #include "flutter/common/task_runners.h"
 #include "flutter/flow/layers/layer_tree.h"
+#include "flutter/fml/macros.h"
 #include "flutter/lib/ui/text/font_collection.h"
 #include "flutter/lib/ui/ui_dart_state.h"
 #include "flutter/lib/ui/window/pointer_data_packet.h"
 #include "flutter/lib/ui/window/window.h"
 #include "flutter/runtime/dart_vm.h"
-#include "lib/fxl/macros.h"
 
 namespace blink {
 class Scene;
@@ -26,11 +26,11 @@ class RuntimeController final : public WindowClient {
  public:
   RuntimeController(RuntimeDelegate& client,
                     DartVM* vm,
-                    fxl::RefPtr<DartSnapshot> isolate_snapshot,
-                    fxl::RefPtr<DartSnapshot> shared_snapshot,
+                    fml::RefPtr<DartSnapshot> isolate_snapshot,
+                    fml::RefPtr<DartSnapshot> shared_snapshot,
                     TaskRunners task_runners,
                     fml::WeakPtr<GrContext> resource_context,
-                    fxl::RefPtr<flow::SkiaUnrefQueue> unref_queue,
+                    fml::RefPtr<flow::SkiaUnrefQueue> unref_queue,
                     std::string advisory_script_uri,
                     std::string advisory_script_entrypoint);
 
@@ -49,13 +49,13 @@ class RuntimeController final : public WindowClient {
 
   bool SetAssistiveTechnologyEnabled(bool enabled);
 
-  bool BeginFrame(fxl::TimePoint frame_time);
+  bool BeginFrame(fml::TimePoint frame_time);
 
   bool NotifyIdle(int64_t deadline);
 
   bool IsRootIsolateRunning() const;
 
-  bool DispatchPlatformMessage(fxl::RefPtr<PlatformMessage> message);
+  bool DispatchPlatformMessage(fml::RefPtr<PlatformMessage> message);
 
   bool DispatchPointerDataPacket(const PointerDataPacket& packet);
 
@@ -87,11 +87,11 @@ class RuntimeController final : public WindowClient {
 
   RuntimeDelegate& client_;
   DartVM* const vm_;
-  fxl::RefPtr<DartSnapshot> isolate_snapshot_;
-  fxl::RefPtr<DartSnapshot> shared_snapshot_;
+  fml::RefPtr<DartSnapshot> isolate_snapshot_;
+  fml::RefPtr<DartSnapshot> shared_snapshot_;
   TaskRunners task_runners_;
   fml::WeakPtr<GrContext> resource_context_;
-  fxl::RefPtr<flow::SkiaUnrefQueue> unref_queue_;
+  fml::RefPtr<flow::SkiaUnrefQueue> unref_queue_;
   std::string advisory_script_uri_;
   std::string advisory_script_entrypoint_;
   WindowData window_data_;
@@ -100,11 +100,11 @@ class RuntimeController final : public WindowClient {
 
   RuntimeController(RuntimeDelegate& client,
                     DartVM* vm,
-                    fxl::RefPtr<DartSnapshot> isolate_snapshot,
-                    fxl::RefPtr<DartSnapshot> shared_snapshot,
+                    fml::RefPtr<DartSnapshot> isolate_snapshot,
+                    fml::RefPtr<DartSnapshot> shared_snapshot,
                     TaskRunners task_runners,
                     fml::WeakPtr<GrContext> resource_context,
-                    fxl::RefPtr<flow::SkiaUnrefQueue> unref_queue,
+                    fml::RefPtr<flow::SkiaUnrefQueue> unref_queue,
                     std::string advisory_script_uri,
                     std::string advisory_script_entrypoint,
                     WindowData data);
@@ -126,12 +126,12 @@ class RuntimeController final : public WindowClient {
   void UpdateSemantics(SemanticsUpdate* update) override;
 
   // |blink::WindowClient|
-  void HandlePlatformMessage(fxl::RefPtr<PlatformMessage> message) override;
+  void HandlePlatformMessage(fml::RefPtr<PlatformMessage> message) override;
 
   // |blink::WindowClient|
   FontCollection& GetFontCollection() override;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(RuntimeController);
+  FML_DISALLOW_COPY_AND_ASSIGN(RuntimeController);
 };
 
 }  // namespace blink
diff --git a/runtime/runtime_delegate.h b/runtime/runtime_delegate.h
index 463ebbbd2807d188fe5778c789b7c4ad78467e2a..2a9bded0a24f01b1ffe59d9c9c5e178547f526fb 100644
--- a/runtime/runtime_delegate.h
+++ b/runtime/runtime_delegate.h
@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "flutter/flow/layers/layer_tree.h"
-#include "flutter/lib/ui/semantics/semantics_node.h"
 #include "flutter/lib/ui/semantics/custom_accessibility_action.h"
+#include "flutter/lib/ui/semantics/semantics_node.h"
 #include "flutter/lib/ui/text/font_collection.h"
 #include "flutter/lib/ui/window/platform_message.h"
 #include "third_party/dart/runtime/include/dart_api.h"
@@ -25,10 +25,11 @@ class RuntimeDelegate {
 
   virtual void Render(std::unique_ptr<flow::LayerTree> layer_tree) = 0;
 
-  virtual void UpdateSemantics(blink::SemanticsNodeUpdates update,
-                               blink::CustomAccessibilityActionUpdates actions) = 0;
+  virtual void UpdateSemantics(
+      blink::SemanticsNodeUpdates update,
+      blink::CustomAccessibilityActionUpdates actions) = 0;
 
-  virtual void HandlePlatformMessage(fxl::RefPtr<PlatformMessage> message) = 0;
+  virtual void HandlePlatformMessage(fml::RefPtr<PlatformMessage> message) = 0;
 
   virtual FontCollection& GetFontCollection() = 0;
 
diff --git a/runtime/service_protocol.cc b/runtime/service_protocol.cc
index bbb30aeb53b7db4781490a924322bc31725a19e2..207e683a90ebc033c0b86f4d36553cda635ccc95 100644
--- a/runtime/service_protocol.cc
+++ b/runtime/service_protocol.cc
@@ -20,19 +20,19 @@
 
 namespace blink {
 
-const fxl::StringView ServiceProtocol::kScreenshotExtensionName =
+const fml::StringView ServiceProtocol::kScreenshotExtensionName =
     "_flutter.screenshot";
-const fxl::StringView ServiceProtocol::kScreenshotSkpExtensionName =
+const fml::StringView ServiceProtocol::kScreenshotSkpExtensionName =
     "_flutter.screenshotSkp";
-const fxl::StringView ServiceProtocol::kRunInViewExtensionName =
+const fml::StringView ServiceProtocol::kRunInViewExtensionName =
     "_flutter.runInView";
-const fxl::StringView ServiceProtocol::kFlushUIThreadTasksExtensionName =
+const fml::StringView ServiceProtocol::kFlushUIThreadTasksExtensionName =
     "_flutter.flushUIThreadTasks";
-const fxl::StringView ServiceProtocol::kSetAssetBundlePathExtensionName =
+const fml::StringView ServiceProtocol::kSetAssetBundlePathExtensionName =
     "_flutter.setAssetBundlePath";
 
-static constexpr fxl::StringView kViewIdPrefx = "_flutterView/";
-static constexpr fxl::StringView kListViewsExtensionName = "_flutter.listViews";
+static constexpr fml::StringView kViewIdPrefx = "_flutterView/";
+static constexpr fml::StringView kListViewsExtensionName = "_flutter.listViews";
 
 ServiceProtocol::ServiceProtocol()
     : endpoints_({
@@ -88,20 +88,20 @@ bool ServiceProtocol::HandleMessage(const char* method,
                                     const char** json_object) {
   Handler::ServiceProtocolMap params;
   for (intptr_t i = 0; i < num_params; i++) {
-    params[fxl::StringView{param_keys[i]}] = fxl::StringView{param_values[i]};
+    params[fml::StringView{param_keys[i]}] = fml::StringView{param_values[i]};
   }
 
 #ifndef NDEBUG
-  FXL_DLOG(INFO) << "Service protcol method: " << method;
-  FXL_DLOG(INFO) << "Arguments: " << params.size();
+  FML_DLOG(INFO) << "Service protcol method: " << method;
+  FML_DLOG(INFO) << "Arguments: " << params.size();
   for (intptr_t i = 0; i < num_params; i++) {
-    FXL_DLOG(INFO) << "  " << i + 1 << ": " << param_keys[i] << " = "
+    FML_DLOG(INFO) << "  " << i + 1 << ": " << param_keys[i] << " = "
                    << param_values[i];
   }
 #endif  // NDEBUG
 
   rapidjson::Document document;
-  bool result = HandleMessage(fxl::StringView{method},                   //
+  bool result = HandleMessage(fml::StringView{method},                   //
                               params,                                    //
                               static_cast<ServiceProtocol*>(user_data),  //
                               document                                   //
@@ -112,14 +112,14 @@ bool ServiceProtocol::HandleMessage(const char* method,
   *json_object = strdup(buffer.GetString());
 
 #ifndef NDEBUG
-  FXL_DLOG(INFO) << "Response: " << *json_object;
-  FXL_DLOG(INFO) << "RPC Result: " << result;
+  FML_DLOG(INFO) << "Response: " << *json_object;
+  FML_DLOG(INFO) << "RPC Result: " << result;
 #endif  // NDEBUG
 
   return result;
 }
 
-bool ServiceProtocol::HandleMessage(fxl::StringView method,
+bool ServiceProtocol::HandleMessage(fml::StringView method,
                                     const Handler::ServiceProtocolMap& params,
                                     ServiceProtocol* service_protocol,
                                     rapidjson::Document& response) {
@@ -131,13 +131,13 @@ bool ServiceProtocol::HandleMessage(fxl::StringView method,
   return service_protocol->HandleMessage(method, params, response);
 }
 
-FXL_WARN_UNUSED_RESULT
+FML_WARN_UNUSED_RESULT
 static bool HandleMessageOnHandler(
     ServiceProtocol::Handler* handler,
-    fxl::StringView method,
+    fml::StringView method,
     const ServiceProtocol::Handler::ServiceProtocolMap& params,
     rapidjson::Document& document) {
-  FXL_DCHECK(handler);
+  FML_DCHECK(handler);
   fml::AutoResetWaitableEvent latch;
   bool result = false;
   fml::TaskRunner::RunNowOrPostTask(
@@ -157,7 +157,7 @@ static bool HandleMessageOnHandler(
   return result;
 }
 
-bool ServiceProtocol::HandleMessage(fxl::StringView method,
+bool ServiceProtocol::HandleMessage(fml::StringView method,
                                     const Handler::ServiceProtocolMap& params,
                                     rapidjson::Document& response) const {
   if (method == kListViewsExtensionName) {
@@ -175,7 +175,7 @@ bool ServiceProtocol::HandleMessage(fxl::StringView method,
   }
 
   // Find the handler by its "viewId" in the params.
-  auto view_id_param_found = params.find(fxl::StringView{"viewId"});
+  auto view_id_param_found = params.find(fml::StringView{"viewId"});
   if (view_id_param_found != params.end()) {
     auto handler = reinterpret_cast<Handler*>(std::stoull(
         view_id_param_found->second.data() + kViewIdPrefx.size(), nullptr, 16));
diff --git a/runtime/service_protocol.h b/runtime/service_protocol.h
index 056f7389ea79aba580877dca21fb5915752374b7..9b255d12c3babfac67ebeeb6988d81330b51c73d 100644
--- a/runtime/service_protocol.h
+++ b/runtime/service_protocol.h
@@ -10,21 +10,22 @@
 #include <set>
 #include <string>
 
+#include "flutter/fml/compiler_specific.h"
+#include "flutter/fml/macros.h"
+#include "flutter/fml/string_view.h"
+#include "flutter/fml/synchronization/thread_annotations.h"
 #include "flutter/fml/task_runner.h"
-#include "lib/fxl/macros.h"
-#include "lib/fxl/strings/string_view.h"
-#include "lib/fxl/synchronization/thread_annotations.h"
 #include "third_party/rapidjson/rapidjson/document.h"
 
 namespace blink {
 
 class ServiceProtocol {
  public:
-  static const fxl::StringView kScreenshotExtensionName;
-  static const fxl::StringView kScreenshotSkpExtensionName;
-  static const fxl::StringView kRunInViewExtensionName;
-  static const fxl::StringView kFlushUIThreadTasksExtensionName;
-  static const fxl::StringView kSetAssetBundlePathExtensionName;
+  static const fml::StringView kScreenshotExtensionName;
+  static const fml::StringView kScreenshotSkpExtensionName;
+  static const fml::StringView kRunInViewExtensionName;
+  static const fml::StringView kFlushUIThreadTasksExtensionName;
+  static const fml::StringView kSetAssetBundlePathExtensionName;
 
   class Handler {
    public:
@@ -43,15 +44,15 @@ class ServiceProtocol {
                  rapidjson::MemoryPoolAllocator<>& allocator) const;
     };
 
-    using ServiceProtocolMap = std::map<fxl::StringView, fxl::StringView>;
+    using ServiceProtocolMap = std::map<fml::StringView, fml::StringView>;
 
-    virtual fxl::RefPtr<fxl::TaskRunner> GetServiceProtocolHandlerTaskRunner(
-        fxl::StringView method) const = 0;
+    virtual fml::RefPtr<fml::TaskRunner> GetServiceProtocolHandlerTaskRunner(
+        fml::StringView method) const = 0;
 
     virtual Description GetServiceProtocolDescription() const = 0;
 
     virtual bool HandleServiceProtocolMessage(
-        fxl::StringView method,  // one if the extension names specified above.
+        fml::StringView method,  // one if the extension names specified above.
         const ServiceProtocolMap& params,
         rapidjson::Document& response) = 0;
   };
@@ -67,31 +68,31 @@ class ServiceProtocol {
   void RemoveHandler(Handler* handler);
 
  private:
-  const std::set<fxl::StringView> endpoints_;
+  const std::set<fml::StringView> endpoints_;
   mutable std::mutex handlers_mutex_;
   std::set<Handler*> handlers_;
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   static bool HandleMessage(const char* method,
                             const char** param_keys,
                             const char** param_values,
                             intptr_t num_params,
                             void* user_data,
                             const char** json_object);
-  FXL_WARN_UNUSED_RESULT
-  static bool HandleMessage(fxl::StringView method,
+  FML_WARN_UNUSED_RESULT
+  static bool HandleMessage(fml::StringView method,
                             const Handler::ServiceProtocolMap& params,
                             ServiceProtocol* service_protocol,
                             rapidjson::Document& response);
-  FXL_WARN_UNUSED_RESULT
-  bool HandleMessage(fxl::StringView method,
+  FML_WARN_UNUSED_RESULT
+  bool HandleMessage(fml::StringView method,
                      const Handler::ServiceProtocolMap& params,
                      rapidjson::Document& response) const;
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool HandleListViewsMethod(rapidjson::Document& response) const;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(ServiceProtocol);
+  FML_DISALLOW_COPY_AND_ASSIGN(ServiceProtocol);
 };
 
 }  // namespace blink
diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn
index b0a09cf467d493769821d5f4fc299bbd2bf30006..74ab39e06ebb2f25dbce588289f616ca7c8cb177 100644
--- a/shell/common/BUILD.gn
+++ b/shell/common/BUILD.gn
@@ -99,7 +99,6 @@ source_set("common") {
     "$flutter_root/lib/ui",
     "$flutter_root/runtime",
     "$flutter_root/synchronization",
-    "//garnet/public/lib/fxl",
     "//third_party/dart/runtime:dart_api",
     "//third_party/rapidjson",
     "//third_party/skia",
@@ -125,7 +124,6 @@ executable("shell_unittests") {
     "$flutter_root/fml",
     "$flutter_root/lib/snapshot",
     "$flutter_root/testing",
-    "//garnet/public/lib/fxl",
     "//third_party/dart/runtime:libdart_jit",
     "//third_party/skia",
     "//third_party/tonic",
diff --git a/shell/common/animator.cc b/shell/common/animator.cc
index d929a11e3b0dcd9ea894c180e0d71bca8693c0dc..ad7d75fdab65eddfca5bc4f2a7f06ee03370c02c 100644
--- a/shell/common/animator.cc
+++ b/shell/common/animator.cc
@@ -5,7 +5,6 @@
 #include "flutter/shell/common/animator.h"
 
 #include "flutter/fml/trace_event.h"
-#include "lib/fxl/time/stopwatch.h"
 #include "third_party/dart/runtime/include/dart_tools_api.h"
 
 namespace shell {
@@ -54,14 +53,14 @@ const char* Animator::FrameParity() {
   return (frame_number_ % 2) ? "even" : "odd";
 }
 
-static int64_t FxlToDartOrEarlier(fxl::TimePoint time) {
+static int64_t FxlToDartOrEarlier(fml::TimePoint time) {
   int64_t dart_now = Dart_TimelineGetMicros();
-  fxl::TimePoint fxl_now = fxl::TimePoint::Now();
+  fml::TimePoint fxl_now = fml::TimePoint::Now();
   return (time - fxl_now).ToMicroseconds() + dart_now;
 }
 
-void Animator::BeginFrame(fxl::TimePoint frame_start_time,
-                          fxl::TimePoint frame_target_time) {
+void Animator::BeginFrame(fml::TimePoint frame_start_time,
+                          fml::TimePoint frame_target_time) {
   TRACE_EVENT_ASYNC_END0("flutter", "Frame Request Pending", frame_number_++);
 
   frame_scheduled_ = false;
@@ -85,7 +84,7 @@ void Animator::BeginFrame(fxl::TimePoint frame_start_time,
 
   // We have acquired a valid continuation from the pipeline and are ready
   // to service potential frame.
-  FXL_DCHECK(producer_continuation_);
+  FML_DCHECK(producer_continuation_);
 
   last_begin_frame_time_ = frame_start_time;
   dart_frame_deadline_ = FxlToDartOrEarlier(frame_target_time);
@@ -111,7 +110,7 @@ void Animator::Render(std::unique_ptr<flow::LayerTree> layer_tree) {
 
   if (layer_tree) {
     // Note the frame time for instrumentation.
-    layer_tree->set_construction_time(fxl::TimePoint::Now() -
+    layer_tree->set_construction_time(fml::TimePoint::Now() -
                                       last_begin_frame_time_);
   }
 
@@ -164,8 +163,8 @@ void Animator::RequestFrame(bool regenerate_layer_tree) {
 
 void Animator::AwaitVSync() {
   waiter_->AsyncWaitForVsync(
-      [self = weak_factory_.GetWeakPtr()](fxl::TimePoint frame_start_time,
-                                          fxl::TimePoint frame_target_time) {
+      [self = weak_factory_.GetWeakPtr()](fml::TimePoint frame_start_time,
+                                          fml::TimePoint frame_target_time) {
         if (self) {
           if (self->CanReuseLastLayerTree()) {
             self->DrawLastLayerTree();
diff --git a/shell/common/animator.h b/shell/common/animator.h
index eae7b8ce3ef932479d6e0b52acaff0b005cac178..a44fd214b3e99d6e72e7a34bff6275b222ebe57c 100644
--- a/shell/common/animator.h
+++ b/shell/common/animator.h
@@ -6,13 +6,13 @@
 #define FLUTTER_SHELL_COMMON_ANIMATOR_H_
 
 #include "flutter/common/task_runners.h"
+#include "flutter/fml/memory/ref_ptr.h"
+#include "flutter/fml/memory/weak_ptr.h"
+#include "flutter/fml/time/time_point.h"
 #include "flutter/shell/common/rasterizer.h"
 #include "flutter/shell/common/vsync_waiter.h"
 #include "flutter/synchronization/pipeline.h"
 #include "flutter/synchronization/semaphore.h"
-#include "lib/fxl/memory/ref_ptr.h"
-#include "lib/fxl/memory/weak_ptr.h"
-#include "lib/fxl/time/time_point.h"
 
 namespace shell {
 
@@ -21,7 +21,7 @@ class Animator final {
   class Delegate {
    public:
     virtual void OnAnimatorBeginFrame(const Animator& animator,
-                                      fxl::TimePoint frame_time) = 0;
+                                      fml::TimePoint frame_time) = 0;
 
     virtual void OnAnimatorNotifyIdle(const Animator& animator,
                                       int64_t deadline) = 0;
@@ -52,8 +52,8 @@ class Animator final {
  private:
   using LayerTreePipeline = flutter::Pipeline<flow::LayerTree>;
 
-  void BeginFrame(fxl::TimePoint frame_start_time,
-                  fxl::TimePoint frame_target_time);
+  void BeginFrame(fml::TimePoint frame_start_time,
+                  fml::TimePoint frame_target_time);
 
   bool CanReuseLastLayerTree();
   void DrawLastLayerTree();
@@ -66,7 +66,7 @@ class Animator final {
   blink::TaskRunners task_runners_;
   std::shared_ptr<VsyncWaiter> waiter_;
 
-  fxl::TimePoint last_begin_frame_time_;
+  fml::TimePoint last_begin_frame_time_;
   int64_t dart_frame_deadline_;
   fml::RefPtr<LayerTreePipeline> layer_tree_pipeline_;
   flutter::Semaphore pending_frame_semaphore_;
@@ -78,9 +78,9 @@ class Animator final {
   bool dimension_change_pending_;
   SkISize last_layer_tree_size_;
 
-  fxl::WeakPtrFactory<Animator> weak_factory_;
+  fml::WeakPtrFactory<Animator> weak_factory_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(Animator);
+  FML_DISALLOW_COPY_AND_ASSIGN(Animator);
 };
 
 }  // namespace shell
diff --git a/shell/common/engine.cc b/shell/common/engine.cc
index d65ab82b8c7cec1adaece1c729319eeee3a2cd39..d06001ef2be2ded9ed416fb47dcff917cdd3c29b 100644
--- a/shell/common/engine.cc
+++ b/shell/common/engine.cc
@@ -8,17 +8,17 @@
 #include <utility>
 
 #include "flutter/common/settings.h"
+#include "flutter/fml/eintr_wrapper.h"
+#include "flutter/fml/file.h"
+#include "flutter/fml/make_copyable.h"
+#include "flutter/fml/paths.h"
 #include "flutter/fml/trace_event.h"
+#include "flutter/fml/unique_fd.h"
 #include "flutter/lib/snapshot/snapshot.h"
 #include "flutter/lib/ui/text/font_collection.h"
 #include "flutter/shell/common/animator.h"
 #include "flutter/shell/common/platform_view.h"
 #include "flutter/shell/common/shell.h"
-#include "lib/fxl/files/eintr_wrapper.h"
-#include "lib/fxl/files/file.h"
-#include "lib/fxl/files/path.h"
-#include "lib/fxl/files/unique_fd.h"
-#include "lib/fxl/functional/make_copyable.h"
 #include "third_party/rapidjson/rapidjson/document.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
@@ -37,13 +37,13 @@ static constexpr char kSettingsChannel[] = "flutter/settings";
 
 Engine::Engine(Delegate& delegate,
                blink::DartVM& vm,
-               fxl::RefPtr<blink::DartSnapshot> isolate_snapshot,
-               fxl::RefPtr<blink::DartSnapshot> shared_snapshot,
+               fml::RefPtr<blink::DartSnapshot> isolate_snapshot,
+               fml::RefPtr<blink::DartSnapshot> shared_snapshot,
                blink::TaskRunners task_runners,
                blink::Settings settings,
                std::unique_ptr<Animator> animator,
                fml::WeakPtr<GrContext> resource_context,
-               fxl::RefPtr<flow::SkiaUnrefQueue> unref_queue)
+               fml::RefPtr<flow::SkiaUnrefQueue> unref_queue)
     : delegate_(delegate),
       settings_(std::move(settings)),
       animator_(std::move(animator)),
@@ -98,7 +98,7 @@ bool Engine::UpdateAssetManager(
 bool Engine::Restart(RunConfiguration configuration) {
   TRACE_EVENT0("flutter", "Engine::Restart");
   if (!configuration.IsValid()) {
-    FXL_LOG(ERROR) << "Engine run configuration was invalid.";
+    FML_LOG(ERROR) << "Engine run configuration was invalid.";
     return false;
   }
   runtime_controller_ = runtime_controller_->Clone();
@@ -108,12 +108,12 @@ bool Engine::Restart(RunConfiguration configuration) {
 
 bool Engine::Run(RunConfiguration configuration) {
   if (!configuration.IsValid()) {
-    FXL_LOG(ERROR) << "Engine run configuration was invalid.";
+    FML_LOG(ERROR) << "Engine run configuration was invalid.";
     return false;
   }
 
   if (!PrepareAndLaunchIsolate(std::move(configuration))) {
-    FXL_LOG(ERROR) << "Engine not prepare and launch isolate.";
+    FML_LOG(ERROR) << "Engine not prepare and launch isolate.";
     return false;
   }
 
@@ -154,19 +154,19 @@ bool Engine::PrepareAndLaunchIsolate(RunConfiguration configuration) {
   }
 
   if (!isolate_configuration->PrepareIsolate(*isolate)) {
-    FXL_LOG(ERROR) << "Could not prepare to run the isolate.";
+    FML_LOG(ERROR) << "Could not prepare to run the isolate.";
     return false;
   }
 
   if (configuration.GetEntrypointLibrary().empty()) {
     if (!isolate->Run(configuration.GetEntrypoint())) {
-      FXL_LOG(ERROR) << "Could not run the isolate.";
+      FML_LOG(ERROR) << "Could not run the isolate.";
       return false;
     }
   } else {
     if (!isolate->RunFromLibrary(configuration.GetEntrypointLibrary(),
                                  configuration.GetEntrypoint())) {
-      FXL_LOG(ERROR) << "Could not run the isolate.";
+      FML_LOG(ERROR) << "Could not run the isolate.";
       return false;
     }
   }
@@ -174,7 +174,7 @@ bool Engine::PrepareAndLaunchIsolate(RunConfiguration configuration) {
   return true;
 }
 
-void Engine::BeginFrame(fxl::TimePoint frame_time) {
+void Engine::BeginFrame(fml::TimePoint frame_time) {
   TRACE_EVENT0("flutter", "Engine::BeginFrame");
   runtime_controller_->BeginFrame(frame_time);
 }
@@ -234,7 +234,7 @@ void Engine::SetViewportMetrics(const blink::ViewportMetrics& metrics) {
 }
 
 void Engine::DispatchPlatformMessage(
-    fxl::RefPtr<blink::PlatformMessage> message) {
+    fml::RefPtr<blink::PlatformMessage> message) {
   if (message->channel() == kLifecycleChannel) {
     if (HandleLifecyclePlatformMessage(message.get()))
       return;
@@ -279,7 +279,7 @@ bool Engine::HandleLifecyclePlatformMessage(blink::PlatformMessage* message) {
 }
 
 bool Engine::HandleNavigationPlatformMessage(
-    fxl::RefPtr<blink::PlatformMessage> message) {
+    fml::RefPtr<blink::PlatformMessage> message) {
   const auto& data = message->data();
 
   rapidjson::Document document;
@@ -389,7 +389,7 @@ void Engine::UpdateSemantics(blink::SemanticsNodeUpdates update,
 }
 
 void Engine::HandlePlatformMessage(
-    fxl::RefPtr<blink::PlatformMessage> message) {
+    fml::RefPtr<blink::PlatformMessage> message) {
   if (message->channel() == kAssetChannel) {
     HandleAssetPlatformMessage(std::move(message));
   } else {
@@ -402,8 +402,8 @@ blink::FontCollection& Engine::GetFontCollection() {
 }
 
 void Engine::HandleAssetPlatformMessage(
-    fxl::RefPtr<blink::PlatformMessage> message) {
-  fxl::RefPtr<blink::PlatformMessageResponse> response = message->response();
+    fml::RefPtr<blink::PlatformMessage> message) {
+  fml::RefPtr<blink::PlatformMessageResponse> response = message->response();
   if (!response) {
     return;
   }
diff --git a/shell/common/engine.h b/shell/common/engine.h
index 336a54b4ef40aaf1f3b3be89898381f422b2ca41..d79c9cdd545f599e17a4f73b87d3c35a98eae88a 100644
--- a/shell/common/engine.h
+++ b/shell/common/engine.h
@@ -10,6 +10,8 @@
 
 #include "flutter/assets/asset_manager.h"
 #include "flutter/common/task_runners.h"
+#include "flutter/fml/macros.h"
+#include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/lib/ui/semantics/custom_accessibility_action.h"
 #include "flutter/lib/ui/semantics/semantics_node.h"
 #include "flutter/lib/ui/text/font_collection.h"
@@ -21,8 +23,6 @@
 #include "flutter/shell/common/animator.h"
 #include "flutter/shell/common/rasterizer.h"
 #include "flutter/shell/common/run_configuration.h"
-#include "lib/fxl/macros.h"
-#include "lib/fxl/memory/weak_ptr.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
 namespace shell {
@@ -38,36 +38,36 @@ class Engine final : public blink::RuntimeDelegate {
 
     virtual void OnEngineHandlePlatformMessage(
         const Engine& engine,
-        fxl::RefPtr<blink::PlatformMessage> message) = 0;
+        fml::RefPtr<blink::PlatformMessage> message) = 0;
   };
 
   Engine(Delegate& delegate,
          blink::DartVM& vm,
-         fxl::RefPtr<blink::DartSnapshot> isolate_snapshot,
-         fxl::RefPtr<blink::DartSnapshot> shared_snapshot,
+         fml::RefPtr<blink::DartSnapshot> isolate_snapshot,
+         fml::RefPtr<blink::DartSnapshot> shared_snapshot,
          blink::TaskRunners task_runners,
          blink::Settings settings,
          std::unique_ptr<Animator> animator,
          fml::WeakPtr<GrContext> resource_context,
-         fxl::RefPtr<flow::SkiaUnrefQueue> unref_queue);
+         fml::RefPtr<flow::SkiaUnrefQueue> unref_queue);
 
   ~Engine() override;
 
   fml::WeakPtr<Engine> GetWeakPtr() const;
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool Run(RunConfiguration configuration);
 
   // Used to "cold reload" a running application where the shell (along with the
   // platform view and its rasterizer bindings) remains the same but the root
   // isolate is torn down and restarted with the new configuration. Only used in
   // the development workflow.
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool Restart(RunConfiguration configuration);
 
   bool UpdateAssetManager(fml::RefPtr<blink::AssetManager> asset_manager);
 
-  void BeginFrame(fxl::TimePoint frame_time);
+  void BeginFrame(fml::TimePoint frame_time);
 
   void NotifyIdle(int64_t deadline);
 
@@ -89,7 +89,7 @@ class Engine final : public blink::RuntimeDelegate {
 
   void SetViewportMetrics(const blink::ViewportMetrics& metrics);
 
-  void DispatchPlatformMessage(fxl::RefPtr<blink::PlatformMessage> message);
+  void DispatchPlatformMessage(fml::RefPtr<blink::PlatformMessage> message);
 
   void DispatchPointerDataPacket(const blink::PointerDataPacket& packet);
 
@@ -133,7 +133,7 @@ class Engine final : public blink::RuntimeDelegate {
 
   // |blink::RuntimeDelegate|
   void HandlePlatformMessage(
-      fxl::RefPtr<blink::PlatformMessage> message) override;
+      fml::RefPtr<blink::PlatformMessage> message) override;
 
   void StopAnimator();
 
@@ -142,19 +142,19 @@ class Engine final : public blink::RuntimeDelegate {
   bool HandleLifecyclePlatformMessage(blink::PlatformMessage* message);
 
   bool HandleNavigationPlatformMessage(
-      fxl::RefPtr<blink::PlatformMessage> message);
+      fml::RefPtr<blink::PlatformMessage> message);
 
   bool HandleLocalizationPlatformMessage(blink::PlatformMessage* message);
 
   void HandleSettingsPlatformMessage(blink::PlatformMessage* message);
 
-  void HandleAssetPlatformMessage(fxl::RefPtr<blink::PlatformMessage> message);
+  void HandleAssetPlatformMessage(fml::RefPtr<blink::PlatformMessage> message);
 
   bool GetAssetAsBuffer(const std::string& name, std::vector<uint8_t>* data);
 
   bool PrepareAndLaunchIsolate(RunConfiguration configuration);
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(Engine);
+  FML_DISALLOW_COPY_AND_ASSIGN(Engine);
 };
 
 }  // namespace shell
diff --git a/shell/common/io_manager.cc b/shell/common/io_manager.cc
index 2d004fedb1656299f2ce91e068e31c6ddfc9a1e0..d75bf9a6ab10e16f5a637a8f5b052f7199c9f296 100644
--- a/shell/common/io_manager.cc
+++ b/shell/common/io_manager.cc
@@ -38,18 +38,18 @@ sk_sp<GrContext> IOManager::CreateCompatibleResourceLoadingContext(
 }
 
 IOManager::IOManager(sk_sp<GrContext> resource_context,
-                     fxl::RefPtr<fxl::TaskRunner> unref_queue_task_runner)
+                     fml::RefPtr<fml::TaskRunner> unref_queue_task_runner)
     : resource_context_(std::move(resource_context)),
       resource_context_weak_factory_(
           resource_context_ ? std::make_unique<fml::WeakPtrFactory<GrContext>>(
                                   resource_context_.get())
                             : nullptr),
-      unref_queue_(fxl::MakeRefCounted<flow::SkiaUnrefQueue>(
+      unref_queue_(fml::MakeRefCounted<flow::SkiaUnrefQueue>(
           std::move(unref_queue_task_runner),
-          fxl::TimeDelta::FromMilliseconds(250))),
+          fml::TimeDelta::FromMilliseconds(250))),
       weak_factory_(this) {
   if (!resource_context_) {
-    FXL_DLOG(WARNING) << "The IO manager was initialized without a resource "
+    FML_DLOG(WARNING) << "The IO manager was initialized without a resource "
                          "context. Async texture uploads will be disabled. "
                          "Expect performance degradation.";
   }
@@ -67,7 +67,7 @@ fml::WeakPtr<GrContext> IOManager::GetResourceContext() const {
              : fml::WeakPtr<GrContext>();
 }
 
-fxl::RefPtr<flow::SkiaUnrefQueue> IOManager::GetSkiaUnrefQueue() const {
+fml::RefPtr<flow::SkiaUnrefQueue> IOManager::GetSkiaUnrefQueue() const {
   return unref_queue_;
 }
 
diff --git a/shell/common/io_manager.h b/shell/common/io_manager.h
index 42ea80f10e262dabf0721dc61b73b631f8dce947..0b459e20571d58ed3a4f11c6312a4aae7dbea4c6 100644
--- a/shell/common/io_manager.h
+++ b/shell/common/io_manager.h
@@ -8,9 +8,8 @@
 #include <memory>
 
 #include "flutter/flow/skia_gpu_object.h"
+#include "flutter/fml/macros.h"
 #include "flutter/fml/memory/weak_ptr.h"
-#include "lib/fxl/macros.h"
-#include "lib/fxl/memory/weak_ptr.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 
 namespace shell {
@@ -24,13 +23,13 @@ class IOManager {
       GrBackend backend);
 
   IOManager(sk_sp<GrContext> resource_context,
-            fxl::RefPtr<fxl::TaskRunner> unref_queue_task_runner);
+            fml::RefPtr<fml::TaskRunner> unref_queue_task_runner);
 
   ~IOManager();
 
   fml::WeakPtr<GrContext> GetResourceContext() const;
 
-  fxl::RefPtr<flow::SkiaUnrefQueue> GetSkiaUnrefQueue() const;
+  fml::RefPtr<flow::SkiaUnrefQueue> GetSkiaUnrefQueue() const;
 
  private:
   // Resource context management.
@@ -39,11 +38,11 @@ class IOManager {
       resource_context_weak_factory_;
 
   // Unref queue management.
-  fxl::RefPtr<flow::SkiaUnrefQueue> unref_queue_;
+  fml::RefPtr<flow::SkiaUnrefQueue> unref_queue_;
 
   fml::WeakPtrFactory<IOManager> weak_factory_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(IOManager);
+  FML_DISALLOW_COPY_AND_ASSIGN(IOManager);
 };
 
 }  // namespace shell
diff --git a/shell/common/isolate_configuration.cc b/shell/common/isolate_configuration.cc
index 2b3474108b41dc223e36bba0774d86f7404efc19..66dd53fb1b59c090b18d3776b6f783a6339a0d5c 100644
--- a/shell/common/isolate_configuration.cc
+++ b/shell/common/isolate_configuration.cc
@@ -18,7 +18,7 @@ IsolateConfiguration::~IsolateConfiguration() = default;
 
 bool IsolateConfiguration::PrepareIsolate(blink::DartIsolate& isolate) {
   if (isolate.GetPhase() != blink::DartIsolate::Phase::LibrariesSetup) {
-    FXL_DLOG(ERROR)
+    FML_DLOG(ERROR)
         << "Isolate was in incorrect phase to be prepared for running.";
     return false;
   }
@@ -36,7 +36,7 @@ class AppSnapshotIsolateConfiguration final : public IsolateConfiguration {
   }
 
  private:
-  FXL_DISALLOW_COPY_AND_ASSIGN(AppSnapshotIsolateConfiguration);
+  FML_DISALLOW_COPY_AND_ASSIGN(AppSnapshotIsolateConfiguration);
 };
 
 class SnapshotIsolateConfiguration : public IsolateConfiguration {
@@ -55,7 +55,7 @@ class SnapshotIsolateConfiguration : public IsolateConfiguration {
  private:
   std::unique_ptr<fml::Mapping> snapshot_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(SnapshotIsolateConfiguration);
+  FML_DISALLOW_COPY_AND_ASSIGN(SnapshotIsolateConfiguration);
 };
 
 class SourceIsolateConfiguration final : public IsolateConfiguration {
@@ -77,7 +77,7 @@ class SourceIsolateConfiguration final : public IsolateConfiguration {
   std::string main_path_;
   std::string packages_path_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(SourceIsolateConfiguration);
+  FML_DISALLOW_COPY_AND_ASSIGN(SourceIsolateConfiguration);
 };
 
 class KernelListIsolateConfiguration final : public IsolateConfiguration {
@@ -106,7 +106,7 @@ class KernelListIsolateConfiguration final : public IsolateConfiguration {
  private:
   std::vector<std::unique_ptr<fml::Mapping>> kernel_pieces_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(KernelListIsolateConfiguration);
+  FML_DISALLOW_COPY_AND_ASSIGN(KernelListIsolateConfiguration);
 };
 
 std::unique_ptr<IsolateConfiguration> IsolateConfiguration::InferFromSettings(
@@ -169,7 +169,7 @@ std::unique_ptr<IsolateConfiguration> IsolateConfiguration::InferFromSettings(
         std::unique_ptr<fml::Mapping> piece =
             asset_manager->GetAsMapping(piece_path);
         if (piece == nullptr) {
-          FXL_LOG(ERROR) << "Failed to load: " << piece_path;
+          FML_LOG(ERROR) << "Failed to load: " << piece_path;
           return nullptr;
         }
 
diff --git a/shell/common/isolate_configuration.h b/shell/common/isolate_configuration.h
index 1f88195179345719f2adaf8aaf4397e0f769ca6d..ba8752273d6deb3e2f040bcb3be986b97adadc82 100644
--- a/shell/common/isolate_configuration.h
+++ b/shell/common/isolate_configuration.h
@@ -11,10 +11,10 @@
 #include "flutter/assets/asset_manager.h"
 #include "flutter/assets/asset_resolver.h"
 #include "flutter/common/settings.h"
+#include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/runtime/dart_isolate.h"
-#include "lib/fxl/macros.h"
 
 namespace shell {
 
@@ -46,7 +46,7 @@ class IsolateConfiguration {
   virtual bool DoPrepareIsolate(blink::DartIsolate& isolate) = 0;
 
  private:
-  FXL_DISALLOW_COPY_AND_ASSIGN(IsolateConfiguration);
+  FML_DISALLOW_COPY_AND_ASSIGN(IsolateConfiguration);
 };
 
 }  // namespace shell
diff --git a/shell/common/platform_view.cc b/shell/common/platform_view.cc
index 2f0aee3f37e36643ca381c214e51f671958553aa..48d3fbe94b1b8d045dadc0f4f66257b4f52d11ec 100644
--- a/shell/common/platform_view.cc
+++ b/shell/common/platform_view.cc
@@ -6,11 +6,11 @@
 
 #include <utility>
 
+#include "flutter/fml/make_copyable.h"
 #include "flutter/fml/synchronization/waitable_event.h"
 #include "flutter/shell/common/rasterizer.h"
 #include "flutter/shell/common/shell.h"
 #include "flutter/shell/common/vsync_waiter_fallback.h"
-#include "lib/fxl/functional/make_copyable.h"
 #include "third_party/skia/include/gpu/GrContextOptions.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
 
@@ -25,14 +25,14 @@ PlatformView::PlatformView(Delegate& delegate, blink::TaskRunners task_runners)
 PlatformView::~PlatformView() = default;
 
 std::unique_ptr<VsyncWaiter> PlatformView::CreateVSyncWaiter() {
-  FXL_DLOG(WARNING)
+  FML_DLOG(WARNING)
       << "This platform does not provide a Vsync waiter implementation. A "
          "simple timer based fallback is being used.";
   return std::make_unique<VsyncWaiterFallback>(task_runners_);
 }
 
 void PlatformView::DispatchPlatformMessage(
-    fxl::RefPtr<blink::PlatformMessage> message) {
+    fml::RefPtr<blink::PlatformMessage> message) {
   delegate_.OnPlatformViewDispatchPlatformMessage(*this, std::move(message));
 }
 
@@ -69,7 +69,7 @@ void PlatformView::NotifyDestroyed() {
 }
 
 sk_sp<GrContext> PlatformView::CreateResourceContext() const {
-  FXL_DLOG(WARNING) << "This platform does not setup the resource "
+  FML_DLOG(WARNING) << "This platform does not setup the resource "
                        "context on the IO thread for async texture uploads.";
   return nullptr;
 }
@@ -83,7 +83,7 @@ void PlatformView::UpdateSemantics(
     blink::CustomAccessibilityActionUpdates actions) {}
 
 void PlatformView::HandlePlatformMessage(
-    fxl::RefPtr<blink::PlatformMessage> message) {
+    fml::RefPtr<blink::PlatformMessage> message) {
   if (auto response = message->response())
     response->CompleteEmpty();
 }
@@ -103,12 +103,12 @@ void PlatformView::MarkTextureFrameAvailable(int64_t texture_id) {
 std::unique_ptr<Surface> PlatformView::CreateRenderingSurface() {
   // We have a default implementation because tests create a platform view but
   // never a rendering surface.
-  FXL_DCHECK(false) << "This platform does not provide a rendering surface but "
+  FML_DCHECK(false) << "This platform does not provide a rendering surface but "
                        "it was notified of surface rendering surface creation.";
   return nullptr;
 }
 
-void PlatformView::SetNextFrameCallback(fxl::Closure closure) {
+void PlatformView::SetNextFrameCallback(fml::closure closure) {
   if (!closure) {
     return;
   }
diff --git a/shell/common/platform_view.h b/shell/common/platform_view.h
index 9f5fca77d2af375d9a223e167066934b25a4fa20..f4ba65baeb9163f3adddde575695ac3c113a4274 100644
--- a/shell/common/platform_view.h
+++ b/shell/common/platform_view.h
@@ -9,6 +9,7 @@
 
 #include "flutter/common/task_runners.h"
 #include "flutter/flow/texture.h"
+#include "flutter/fml/macros.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/lib/ui/semantics/custom_accessibility_action.h"
 #include "flutter/lib/ui/semantics/semantics_node.h"
@@ -17,7 +18,6 @@
 #include "flutter/lib/ui/window/viewport_metrics.h"
 #include "flutter/shell/common/surface.h"
 #include "flutter/shell/common/vsync_waiter.h"
-#include "lib/fxl/macros.h"
 #include "third_party/skia/include/core/SkSize.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 
@@ -35,7 +35,7 @@ class PlatformView {
     virtual void OnPlatformViewDestroyed(const PlatformView& view) = 0;
 
     virtual void OnPlatformViewSetNextFrameCallback(const PlatformView& view,
-                                                    fxl::Closure closure) = 0;
+                                                    fml::closure closure) = 0;
 
     virtual void OnPlatformViewSetViewportMetrics(
         const PlatformView& view,
@@ -43,7 +43,7 @@ class PlatformView {
 
     virtual void OnPlatformViewDispatchPlatformMessage(
         const PlatformView& view,
-        fxl::RefPtr<blink::PlatformMessage> message) = 0;
+        fml::RefPtr<blink::PlatformMessage> message) = 0;
 
     virtual void OnPlatformViewDispatchPointerDataPacket(
         const PlatformView& view,
@@ -80,7 +80,7 @@ class PlatformView {
 
   virtual std::unique_ptr<VsyncWaiter> CreateVSyncWaiter();
 
-  void DispatchPlatformMessage(fxl::RefPtr<blink::PlatformMessage> message);
+  void DispatchPlatformMessage(fml::RefPtr<blink::PlatformMessage> message);
 
   void DispatchSemanticsAction(int32_t id,
                                blink::SemanticsAction action,
@@ -106,9 +106,9 @@ class PlatformView {
                                blink::CustomAccessibilityActionUpdates actions);
 
   virtual void HandlePlatformMessage(
-      fxl::RefPtr<blink::PlatformMessage> message);
+      fml::RefPtr<blink::PlatformMessage> message);
 
-  void SetNextFrameCallback(fxl::Closure closure);
+  void SetNextFrameCallback(fml::closure closure);
 
   void DispatchPointerDataPacket(
       std::unique_ptr<blink::PointerDataPacket> packet);
@@ -132,7 +132,7 @@ class PlatformView {
   virtual std::unique_ptr<Surface> CreateRenderingSurface();
 
  private:
-  FXL_DISALLOW_COPY_AND_ASSIGN(PlatformView);
+  FML_DISALLOW_COPY_AND_ASSIGN(PlatformView);
 };
 
 }  // namespace shell
diff --git a/shell/common/rasterizer.cc b/shell/common/rasterizer.cc
index 862702e11c22ddc1b052aec89bfcb0613f7b943d..e2721a5d0e9402ae118d3359b398d317bd568d2e 100644
--- a/shell/common/rasterizer.cc
+++ b/shell/common/rasterizer.cc
@@ -25,7 +25,7 @@ Rasterizer::Rasterizer(
     : task_runners_(std::move(task_runners)),
       compositor_context_(std::move(compositor_context)),
       weak_factory_(this) {
-  FXL_DCHECK(compositor_context_);
+  FML_DCHECK(compositor_context_);
 }
 
 Rasterizer::~Rasterizer() = default;
@@ -95,7 +95,7 @@ void Rasterizer::DoDraw(std::unique_ptr<flow::LayerTree> layer_tree) {
 }
 
 bool Rasterizer::DrawToSurface(flow::LayerTree& layer_tree) {
-  FXL_DCHECK(surface_);
+  FML_DCHECK(surface_);
 
   auto frame = surface_->AcquireFrame(layer_tree.frame_size());
 
@@ -129,7 +129,7 @@ bool Rasterizer::DrawToSurface(flow::LayerTree& layer_tree) {
 static sk_sp<SkPicture> ScreenshotLayerTreeAsPicture(
     flow::LayerTree* tree,
     flow::CompositorContext& compositor_context) {
-  FXL_DCHECK(tree != nullptr);
+  FML_DCHECK(tree != nullptr);
   SkPictureRecorder recorder;
   recorder.beginRecording(
       SkRect::MakeWH(tree->frame_size().width(), tree->frame_size().height()));
@@ -211,7 +211,7 @@ Rasterizer::Screenshot Rasterizer::ScreenshotLastLayerTree(
     bool base64_encode) {
   auto layer_tree = GetLastLayerTree();
   if (layer_tree == nullptr) {
-    FXL_DLOG(INFO) << "Last layer tree was null when screenshotting.";
+    FML_DLOG(INFO) << "Last layer tree was null when screenshotting.";
     return {};
   }
 
@@ -235,7 +235,7 @@ Rasterizer::Screenshot Rasterizer::ScreenshotLastLayerTree(
   }
 
   if (data == nullptr) {
-    FXL_DLOG(INFO) << "Sceenshot data was null.";
+    FML_DLOG(INFO) << "Sceenshot data was null.";
     return {};
   }
 
@@ -249,7 +249,7 @@ Rasterizer::Screenshot Rasterizer::ScreenshotLastLayerTree(
   return Rasterizer::Screenshot{data, layer_tree->frame_size()};
 }
 
-void Rasterizer::SetNextFrameCallback(fxl::Closure callback) {
+void Rasterizer::SetNextFrameCallback(fml::closure callback) {
   next_frame_callback_ = callback;
 }
 
diff --git a/shell/common/rasterizer.h b/shell/common/rasterizer.h
index 8bb02a14f3e72113a339115e04c28ed554fe2190..3327d5a23a50bc2f972cad6118cd71ea2ee4b09a 100644
--- a/shell/common/rasterizer.h
+++ b/shell/common/rasterizer.h
@@ -10,11 +10,11 @@
 #include "flutter/common/task_runners.h"
 #include "flutter/flow/compositor_context.h"
 #include "flutter/flow/layers/layer_tree.h"
+#include "flutter/fml/closure.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/synchronization/waitable_event.h"
 #include "flutter/shell/common/surface.h"
 #include "flutter/synchronization/pipeline.h"
-#include "lib/fxl/functional/closure.h"
 
 namespace shell {
 
@@ -61,14 +61,14 @@ class Rasterizer final {
 
   // Sets a callback that will be executed after the next frame is submitted to
   // the surface on the GPU task runner.
-  void SetNextFrameCallback(fxl::Closure callback);
+  void SetNextFrameCallback(fml::closure callback);
 
  private:
   blink::TaskRunners task_runners_;
   std::unique_ptr<Surface> surface_;
   std::unique_ptr<flow::CompositorContext> compositor_context_;
   std::unique_ptr<flow::LayerTree> last_layer_tree_;
-  fxl::Closure next_frame_callback_;
+  fml::closure next_frame_callback_;
   fml::WeakPtrFactory<Rasterizer> weak_factory_;
 
   void DoDraw(std::unique_ptr<flow::LayerTree> layer_tree);
@@ -77,7 +77,7 @@ class Rasterizer final {
 
   void FireNextFrameCallbackIfPresent();
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(Rasterizer);
+  FML_DISALLOW_COPY_AND_ASSIGN(Rasterizer);
 };
 
 }  // namespace shell
diff --git a/shell/common/run_configuration.h b/shell/common/run_configuration.h
index b0adf9181fa6d2962fa1430eae200f157376f06b..bc3b78f52e157d94dcb7bd9e445ba8de7325efeb 100644
--- a/shell/common/run_configuration.h
+++ b/shell/common/run_configuration.h
@@ -11,10 +11,10 @@
 #include "flutter/assets/asset_manager.h"
 #include "flutter/assets/asset_resolver.h"
 #include "flutter/common/settings.h"
+#include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
+#include "flutter/fml/unique_fd.h"
 #include "flutter/shell/common/isolate_configuration.h"
-#include "lib/fxl/files/unique_fd.h"
-#include "lib/fxl/macros.h"
 
 namespace shell {
 
@@ -53,7 +53,7 @@ class RunConfiguration {
   std::string entrypoint_ = "main";
   std::string entrypoint_library_ = "";
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(RunConfiguration);
+  FML_DISALLOW_COPY_AND_ASSIGN(RunConfiguration);
 };
 
 }  // namespace shell
diff --git a/shell/common/shell.cc b/shell/common/shell.cc
index 0b1413a2c7a4bea4c2ef96ba0f4037cde221af20..c0b5497684a0c7843b5cc0b8ba76fc7a5d17fe04 100644
--- a/shell/common/shell.cc
+++ b/shell/common/shell.cc
@@ -15,19 +15,17 @@
 #include "flutter/fml/icu_util.h"
 #include "flutter/fml/log_settings.h"
 #include "flutter/fml/logging.h"
+#include "flutter/fml/make_copyable.h"
 #include "flutter/fml/message_loop.h"
+#include "flutter/fml/paths.h"
 #include "flutter/fml/trace_event.h"
+#include "flutter/fml/unique_fd.h"
 #include "flutter/runtime/dart_vm.h"
 #include "flutter/runtime/start_up.h"
 #include "flutter/shell/common/engine.h"
 #include "flutter/shell/common/skia_event_tracer_impl.h"
 #include "flutter/shell/common/switches.h"
 #include "flutter/shell/common/vsync_waiter.h"
-#include "lib/fxl/files/path.h"
-#include "lib/fxl/files/unique_fd.h"
-#include "lib/fxl/functional/make_copyable.h"
-#include "lib/fxl/log_settings.h"
-#include "lib/fxl/logging.h"
 #include "third_party/dart/runtime/include/dart_tools_api.h"
 #include "third_party/skia/include/core/SkGraphics.h"
 
@@ -40,8 +38,8 @@ namespace shell {
 std::unique_ptr<Shell> Shell::CreateShellOnPlatformThread(
     blink::TaskRunners task_runners,
     blink::Settings settings,
-    fxl::RefPtr<blink::DartSnapshot> isolate_snapshot,
-    fxl::RefPtr<blink::DartSnapshot> shared_snapshot,
+    fml::RefPtr<blink::DartSnapshot> isolate_snapshot,
+    fml::RefPtr<blink::DartSnapshot> shared_snapshot,
     Shell::CreateCallback<PlatformView> on_create_platform_view,
     Shell::CreateCallback<Rasterizer> on_create_rasterizer) {
   if (!task_runners.IsValid()) {
@@ -70,7 +68,7 @@ std::unique_ptr<Shell> Shell::CreateShellOnPlatformThread(
   fml::AutoResetWaitableEvent io_latch;
   std::unique_ptr<IOManager> io_manager;
   fml::WeakPtr<GrContext> resource_context;
-  fxl::RefPtr<flow::SkiaUnrefQueue> unref_queue;
+  fml::RefPtr<flow::SkiaUnrefQueue> unref_queue;
   auto io_task_runner = shell->GetTaskRunners().GetIOTaskRunner();
   fml::TaskRunner::RunNowOrPostTask(
       io_task_runner,
@@ -109,7 +107,7 @@ std::unique_ptr<Shell> Shell::CreateShellOnPlatformThread(
   std::unique_ptr<Engine> engine;
   fml::TaskRunner::RunNowOrPostTask(
       shell->GetTaskRunners().GetUITaskRunner(),
-      fxl::MakeCopyable([&ui_latch,                                       //
+      fml::MakeCopyable([&ui_latch,                                       //
                          &engine,                                         //
                          shell = shell.get(),                             //
                          isolate_snapshot = std::move(isolate_snapshot),  //
@@ -171,15 +169,6 @@ static void PerformInitializationTasks(const blink::Settings& settings) {
   std::call_once(gShellSettingsInitialization, [&settings] {
     RecordStartupTimestamp();
 
-    //  TODO(chinmaygarde): There are currently two loggers till the transition
-    //  away from FXL is ongoing. Remove FXL when done.
-    {
-      fxl::LogSettings log_settings;
-      log_settings.min_log_level =
-          settings.verbose_logging ? fxl::LOG_INFO : fxl::LOG_ERROR;
-      fxl::SetLogSettings(log_settings);
-    }
-
     {
       fml::LogSettings log_settings;
       log_settings.min_log_level =
@@ -194,13 +183,13 @@ static void PerformInitializationTasks(const blink::Settings& settings) {
     if (!settings.skia_deterministic_rendering_on_cpu) {
       SkGraphics::Init();
     } else {
-      FXL_DLOG(INFO) << "Skia deterministic rendering is enabled.";
+      FML_DLOG(INFO) << "Skia deterministic rendering is enabled.";
     }
 
     if (settings.icu_data_path.size() != 0) {
       fml::icu::InitializeICU(settings.icu_data_path);
     } else {
-      FXL_DLOG(WARNING) << "Skipping ICU initialization in the shell.";
+      FML_DLOG(WARNING) << "Skipping ICU initialization in the shell.";
     }
   });
 }
@@ -213,7 +202,7 @@ std::unique_ptr<Shell> Shell::Create(
   PerformInitializationTasks(settings);
 
   auto vm = blink::DartVM::ForProcess(settings);
-  FXL_CHECK(vm) << "Must be able to initialize the VM.";
+  FML_CHECK(vm) << "Must be able to initialize the VM.";
   return Shell::Create(std::move(task_runners),             //
                        std::move(settings),                 //
                        vm->GetIsolateSnapshot(),            //
@@ -226,8 +215,8 @@ std::unique_ptr<Shell> Shell::Create(
 std::unique_ptr<Shell> Shell::Create(
     blink::TaskRunners task_runners,
     blink::Settings settings,
-    fxl::RefPtr<blink::DartSnapshot> isolate_snapshot,
-    fxl::RefPtr<blink::DartSnapshot> shared_snapshot,
+    fml::RefPtr<blink::DartSnapshot> isolate_snapshot,
+    fml::RefPtr<blink::DartSnapshot> shared_snapshot,
     Shell::CreateCallback<PlatformView> on_create_platform_view,
     Shell::CreateCallback<Rasterizer> on_create_rasterizer) {
   PerformInitializationTasks(settings);
@@ -267,8 +256,8 @@ Shell::Shell(blink::TaskRunners task_runners, blink::Settings settings)
     : task_runners_(std::move(task_runners)),
       settings_(std::move(settings)),
       vm_(blink::DartVM::ForProcess(settings_)) {
-  FXL_DCHECK(task_runners_.IsValid());
-  FXL_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(task_runners_.IsValid());
+  FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   // Install service protocol handlers.
 
@@ -308,7 +297,7 @@ Shell::~Shell() {
 
   fml::TaskRunner::RunNowOrPostTask(
       task_runners_.GetUITaskRunner(),
-      fxl::MakeCopyable([engine = std::move(engine_), &ui_latch]() mutable {
+      fml::MakeCopyable([engine = std::move(engine_), &ui_latch]() mutable {
         engine.reset();
         ui_latch.Signal();
       }));
@@ -316,7 +305,7 @@ Shell::~Shell() {
 
   fml::TaskRunner::RunNowOrPostTask(
       task_runners_.GetGPUTaskRunner(),
-      fxl::MakeCopyable(
+      fml::MakeCopyable(
           [rasterizer = std::move(rasterizer_), &gpu_latch]() mutable {
             rasterizer.reset();
             gpu_latch.Signal();
@@ -325,7 +314,7 @@ Shell::~Shell() {
 
   fml::TaskRunner::RunNowOrPostTask(
       task_runners_.GetIOTaskRunner(),
-      fxl::MakeCopyable(
+      fml::MakeCopyable(
           [io_manager = std::move(io_manager_), &io_latch]() mutable {
             io_manager.reset();
             io_latch.Signal();
@@ -338,7 +327,7 @@ Shell::~Shell() {
   // example, the NSOpenGLContext on the Mac.
   fml::TaskRunner::RunNowOrPostTask(
       task_runners_.GetPlatformTaskRunner(),
-      fxl::MakeCopyable([platform_view = std::move(platform_view_),
+      fml::MakeCopyable([platform_view = std::move(platform_view_),
                          &platform_latch]() mutable {
         platform_view.reset();
         platform_latch.Signal();
@@ -385,17 +374,17 @@ const blink::TaskRunners& Shell::GetTaskRunners() const {
 }
 
 fml::WeakPtr<Rasterizer> Shell::GetRasterizer() {
-  FXL_DCHECK(is_setup_);
+  FML_DCHECK(is_setup_);
   return rasterizer_->GetWeakPtr();
 }
 
 fml::WeakPtr<Engine> Shell::GetEngine() {
-  FXL_DCHECK(is_setup_);
+  FML_DCHECK(is_setup_);
   return engine_->GetWeakPtr();
 }
 
 fml::WeakPtr<PlatformView> Shell::GetPlatformView() {
-  FXL_DCHECK(is_setup_);
+  FML_DCHECK(is_setup_);
   return platform_view_->GetWeakPtr();
 }
 
@@ -406,9 +395,9 @@ blink::DartVM& Shell::GetDartVM() const {
 // |shell::PlatformView::Delegate|
 void Shell::OnPlatformViewCreated(const PlatformView& view,
                                   std::unique_ptr<Surface> surface) {
-  FXL_DCHECK(is_setup_);
-  FXL_DCHECK(&view == platform_view_.get());
-  FXL_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(is_setup_);
+  FML_DCHECK(&view == platform_view_.get());
+  FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   // Note:
   // This is a synchronous operation because certain platforms depend on
@@ -416,7 +405,7 @@ void Shell::OnPlatformViewCreated(const PlatformView& view,
   // a synchronous fashion.
 
   fml::AutoResetWaitableEvent latch;
-  auto gpu_task = fxl::MakeCopyable([rasterizer = rasterizer_->GetWeakPtr(),  //
+  auto gpu_task = fml::MakeCopyable([rasterizer = rasterizer_->GetWeakPtr(),  //
                                      surface = std::move(surface),            //
                                      &latch]() mutable {
     if (rasterizer) {
@@ -447,9 +436,9 @@ void Shell::OnPlatformViewCreated(const PlatformView& view,
 
 // |shell::PlatformView::Delegate|
 void Shell::OnPlatformViewDestroyed(const PlatformView& view) {
-  FXL_DCHECK(is_setup_);
-  FXL_DCHECK(&view == platform_view_.get());
-  FXL_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(is_setup_);
+  FML_DCHECK(&view == platform_view_.get());
+  FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   // Note:
   // This is a synchronous operation because certain platforms depend on
@@ -498,9 +487,9 @@ void Shell::OnPlatformViewDestroyed(const PlatformView& view) {
 void Shell::OnPlatformViewSetViewportMetrics(
     const PlatformView& view,
     const blink::ViewportMetrics& metrics) {
-  FXL_DCHECK(is_setup_);
-  FXL_DCHECK(&view == platform_view_.get());
-  FXL_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(is_setup_);
+  FML_DCHECK(&view == platform_view_.get());
+  FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   task_runners_.GetUITaskRunner()->PostTask(
       [engine = engine_->GetWeakPtr(), metrics]() {
@@ -513,10 +502,10 @@ void Shell::OnPlatformViewSetViewportMetrics(
 // |shell::PlatformView::Delegate|
 void Shell::OnPlatformViewDispatchPlatformMessage(
     const PlatformView& view,
-    fxl::RefPtr<blink::PlatformMessage> message) {
-  FXL_DCHECK(is_setup_);
-  FXL_DCHECK(&view == platform_view_.get());
-  FXL_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
+    fml::RefPtr<blink::PlatformMessage> message) {
+  FML_DCHECK(is_setup_);
+  FML_DCHECK(&view == platform_view_.get());
+  FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   task_runners_.GetUITaskRunner()->PostTask(
       [engine = engine_->GetWeakPtr(), message = std::move(message)] {
@@ -530,10 +519,10 @@ void Shell::OnPlatformViewDispatchPlatformMessage(
 void Shell::OnPlatformViewDispatchPointerDataPacket(
     const PlatformView& view,
     std::unique_ptr<blink::PointerDataPacket> packet) {
-  FXL_DCHECK(is_setup_);
-  FXL_DCHECK(&view == platform_view_.get());
-  FXL_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
-  task_runners_.GetUITaskRunner()->PostTask(fxl::MakeCopyable(
+  FML_DCHECK(is_setup_);
+  FML_DCHECK(&view == platform_view_.get());
+  FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
+  task_runners_.GetUITaskRunner()->PostTask(fml::MakeCopyable(
       [engine = engine_->GetWeakPtr(), packet = std::move(packet)] {
         if (engine) {
           engine->DispatchPointerDataPacket(*packet);
@@ -546,9 +535,9 @@ void Shell::OnPlatformViewDispatchSemanticsAction(const PlatformView& view,
                                                   int32_t id,
                                                   blink::SemanticsAction action,
                                                   std::vector<uint8_t> args) {
-  FXL_DCHECK(is_setup_);
-  FXL_DCHECK(&view == platform_view_.get());
-  FXL_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(is_setup_);
+  FML_DCHECK(&view == platform_view_.get());
+  FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   task_runners_.GetUITaskRunner()->PostTask(
       [engine = engine_->GetWeakPtr(), id, action, args = std::move(args)] {
@@ -561,9 +550,9 @@ void Shell::OnPlatformViewDispatchSemanticsAction(const PlatformView& view,
 // |shell::PlatformView::Delegate|
 void Shell::OnPlatformViewSetSemanticsEnabled(const PlatformView& view,
                                               bool enabled) {
-  FXL_DCHECK(is_setup_);
-  FXL_DCHECK(&view == platform_view_.get());
-  FXL_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(is_setup_);
+  FML_DCHECK(&view == platform_view_.get());
+  FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   task_runners_.GetUITaskRunner()->PostTask(
       [engine = engine_->GetWeakPtr(), enabled] {
@@ -576,9 +565,9 @@ void Shell::OnPlatformViewSetSemanticsEnabled(const PlatformView& view,
 void Shell::OnPlatformViewSetAssistiveTechnologyEnabled(
     const PlatformView& view,
     bool enabled) {
-  FXL_DCHECK(is_setup_);
-  FXL_DCHECK(&view == platform_view_.get());
-  FXL_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(is_setup_);
+  FML_DCHECK(&view == platform_view_.get());
+  FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   task_runners_.GetUITaskRunner()->PostTask(
       [engine = engine_->GetWeakPtr(), enabled] {
@@ -592,9 +581,9 @@ void Shell::OnPlatformViewSetAssistiveTechnologyEnabled(
 void Shell::OnPlatformViewRegisterTexture(
     const PlatformView& view,
     std::shared_ptr<flow::Texture> texture) {
-  FXL_DCHECK(is_setup_);
-  FXL_DCHECK(&view == platform_view_.get());
-  FXL_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(is_setup_);
+  FML_DCHECK(&view == platform_view_.get());
+  FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   task_runners_.GetGPUTaskRunner()->PostTask(
       [rasterizer = rasterizer_->GetWeakPtr(), texture] {
@@ -609,9 +598,9 @@ void Shell::OnPlatformViewRegisterTexture(
 // |shell::PlatformView::Delegate|
 void Shell::OnPlatformViewUnregisterTexture(const PlatformView& view,
                                             int64_t texture_id) {
-  FXL_DCHECK(is_setup_);
-  FXL_DCHECK(&view == platform_view_.get());
-  FXL_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(is_setup_);
+  FML_DCHECK(&view == platform_view_.get());
+  FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   task_runners_.GetGPUTaskRunner()->PostTask(
       [rasterizer = rasterizer_->GetWeakPtr(), texture_id]() {
@@ -626,9 +615,9 @@ void Shell::OnPlatformViewUnregisterTexture(const PlatformView& view,
 // |shell::PlatformView::Delegate|
 void Shell::OnPlatformViewMarkTextureFrameAvailable(const PlatformView& view,
                                                     int64_t texture_id) {
-  FXL_DCHECK(is_setup_);
-  FXL_DCHECK(&view == platform_view_.get());
-  FXL_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(is_setup_);
+  FML_DCHECK(&view == platform_view_.get());
+  FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   // Tell the rasterizer that one of its textures has a new frame available.
   task_runners_.GetGPUTaskRunner()->PostTask(
@@ -658,10 +647,10 @@ void Shell::OnPlatformViewMarkTextureFrameAvailable(const PlatformView& view,
 
 // |shell::PlatformView::Delegate|
 void Shell::OnPlatformViewSetNextFrameCallback(const PlatformView& view,
-                                               fxl::Closure closure) {
-  FXL_DCHECK(is_setup_);
-  FXL_DCHECK(&view == platform_view_.get());
-  FXL_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
+                                               fml::closure closure) {
+  FML_DCHECK(is_setup_);
+  FML_DCHECK(&view == platform_view_.get());
+  FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   task_runners_.GetGPUTaskRunner()->PostTask(
       [rasterizer = rasterizer_->GetWeakPtr(), closure = std::move(closure)]() {
@@ -673,9 +662,9 @@ void Shell::OnPlatformViewSetNextFrameCallback(const PlatformView& view,
 
 // |shell::Animator::Delegate|
 void Shell::OnAnimatorBeginFrame(const Animator& animator,
-                                 fxl::TimePoint frame_time) {
-  FXL_DCHECK(is_setup_);
-  FXL_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
+                                 fml::TimePoint frame_time) {
+  FML_DCHECK(is_setup_);
+  FML_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
 
   if (engine_) {
     engine_->BeginFrame(frame_time);
@@ -684,8 +673,8 @@ void Shell::OnAnimatorBeginFrame(const Animator& animator,
 
 // |shell::Animator::Delegate|
 void Shell::OnAnimatorNotifyIdle(const Animator& animator, int64_t deadline) {
-  FXL_DCHECK(is_setup_);
-  FXL_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(is_setup_);
+  FML_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
 
   if (engine_) {
     engine_->NotifyIdle(deadline);
@@ -696,7 +685,7 @@ void Shell::OnAnimatorNotifyIdle(const Animator& animator, int64_t deadline) {
 void Shell::OnAnimatorDraw(
     const Animator& animator,
     fml::RefPtr<flutter::Pipeline<flow::LayerTree>> pipeline) {
-  FXL_DCHECK(is_setup_);
+  FML_DCHECK(is_setup_);
 
   task_runners_.GetGPUTaskRunner()->PostTask(
       [rasterizer = rasterizer_->GetWeakPtr(),
@@ -709,7 +698,7 @@ void Shell::OnAnimatorDraw(
 
 // |shell::Animator::Delegate|
 void Shell::OnAnimatorDrawLastLayerTree(const Animator& animator) {
-  FXL_DCHECK(is_setup_);
+  FML_DCHECK(is_setup_);
 
   task_runners_.GetGPUTaskRunner()->PostTask(
       [rasterizer = rasterizer_->GetWeakPtr()]() {
@@ -724,8 +713,8 @@ void Shell::OnEngineUpdateSemantics(
     const Engine& engine,
     blink::SemanticsNodeUpdates update,
     blink::CustomAccessibilityActionUpdates actions) {
-  FXL_DCHECK(is_setup_);
-  FXL_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(is_setup_);
+  FML_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
 
   task_runners_.GetPlatformTaskRunner()->PostTask(
       [view = platform_view_->GetWeakPtr(), update = std::move(update),
@@ -739,9 +728,9 @@ void Shell::OnEngineUpdateSemantics(
 // |shell::Engine::Delegate|
 void Shell::OnEngineHandlePlatformMessage(
     const Engine& engine,
-    fxl::RefPtr<blink::PlatformMessage> message) {
-  FXL_DCHECK(is_setup_);
-  FXL_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
+    fml::RefPtr<blink::PlatformMessage> message) {
+  FML_DCHECK(is_setup_);
+  FML_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
 
   task_runners_.GetPlatformTaskRunner()->PostTask(
       [view = platform_view_->GetWeakPtr(), message = std::move(message)]() {
@@ -752,9 +741,9 @@ void Shell::OnEngineHandlePlatformMessage(
 }
 
 // |blink::ServiceProtocol::Handler|
-fxl::RefPtr<fxl::TaskRunner> Shell::GetServiceProtocolHandlerTaskRunner(
-    fxl::StringView method) const {
-  FXL_DCHECK(is_setup_);
+fml::RefPtr<fml::TaskRunner> Shell::GetServiceProtocolHandlerTaskRunner(
+    fml::StringView method) const {
+  FML_DCHECK(is_setup_);
   auto found = service_protocol_handlers_.find(method.ToString());
   if (found != service_protocol_handlers_.end()) {
     return found->second.first;
@@ -764,7 +753,7 @@ fxl::RefPtr<fxl::TaskRunner> Shell::GetServiceProtocolHandlerTaskRunner(
 
 // |blink::ServiceProtocol::Handler|
 bool Shell::HandleServiceProtocolMessage(
-    fxl::StringView method,  // one if the extension names specified above.
+    fml::StringView method,  // one if the extension names specified above.
     const ServiceProtocolMap& params,
     rapidjson::Document& response) {
   auto found = service_protocol_handlers_.find(method.ToString());
@@ -801,7 +790,7 @@ static void ServiceProtocolParameterError(rapidjson::Document& response,
 bool Shell::OnServiceProtocolScreenshot(
     const blink::ServiceProtocol::Handler::ServiceProtocolMap& params,
     rapidjson::Document& response) {
-  FXL_DCHECK(task_runners_.GetGPUTaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(task_runners_.GetGPUTaskRunner()->RunsTasksOnCurrentThread());
   auto screenshot = rasterizer_->ScreenshotLastLayerTree(
       Rasterizer::ScreenshotType::CompressedImage, true);
   if (screenshot.data) {
@@ -823,7 +812,7 @@ bool Shell::OnServiceProtocolScreenshot(
 bool Shell::OnServiceProtocolScreenshotSKP(
     const blink::ServiceProtocol::Handler::ServiceProtocolMap& params,
     rapidjson::Document& response) {
-  FXL_DCHECK(task_runners_.GetGPUTaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(task_runners_.GetGPUTaskRunner()->RunsTasksOnCurrentThread());
   auto screenshot = rasterizer_->ScreenshotLastLayerTree(
       Rasterizer::ScreenshotType::SkiaPicture, true);
   if (screenshot.data) {
@@ -857,7 +846,7 @@ static bool FileNameIsDill(const std::string& name) {
 bool Shell::OnServiceProtocolRunInView(
     const blink::ServiceProtocol::Handler::ServiceProtocolMap& params,
     rapidjson::Document& response) {
-  FXL_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
 
   if (params.count("mainScript") == 0) {
     ServiceProtocolParameterError(response,
@@ -882,7 +871,7 @@ bool Shell::OnServiceProtocolRunInView(
   }
 
   auto main_script_file =
-      files::AbsolutePath(params.at("mainScript").ToString());
+      fml::paths::AbsolutePath(params.at("mainScript").ToString());
 
   auto isolate_configuration =
       FileNameIsDill(main_script_file)
@@ -907,12 +896,12 @@ bool Shell::OnServiceProtocolRunInView(
     response.AddMember("view", view, allocator);
     return true;
   } else {
-    FXL_DLOG(ERROR) << "Could not run configuration in engine.";
+    FML_DLOG(ERROR) << "Could not run configuration in engine.";
     response.AddMember("type", "Failure", allocator);
     return false;
   }
 
-  FXL_DCHECK(false);
+  FML_DCHECK(false);
   return false;
 }
 
@@ -920,7 +909,7 @@ bool Shell::OnServiceProtocolRunInView(
 bool Shell::OnServiceProtocolFlushUIThreadTasks(
     const blink::ServiceProtocol::Handler::ServiceProtocolMap& params,
     rapidjson::Document& response) {
-  FXL_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
   // This API should not be invoked by production code.
   // It can potentially starve the service isolate if the main isolate pauses
   // at a breakpoint or is in an infinite loop.
@@ -936,7 +925,7 @@ bool Shell::OnServiceProtocolFlushUIThreadTasks(
 bool Shell::OnServiceProtocolSetAssetBundlePath(
     const blink::ServiceProtocol::Handler::ServiceProtocolMap& params,
     rapidjson::Document& response) {
-  FXL_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
 
   if (params.count("assetDirectory") == 0) {
     ServiceProtocolParameterError(response,
@@ -961,12 +950,12 @@ bool Shell::OnServiceProtocolSetAssetBundlePath(
     response.AddMember("view", view, allocator);
     return true;
   } else {
-    FXL_DLOG(ERROR) << "Could not update asset directory.";
+    FML_DLOG(ERROR) << "Could not update asset directory.";
     response.AddMember("type", "Failure", allocator);
     return false;
   }
 
-  FXL_DCHECK(false);
+  FML_DCHECK(false);
   return false;
 }
 
diff --git a/shell/common/shell.h b/shell/common/shell.h
index 59dafe469e1beaee347d862772fd95dbab4f591a..8e2fbbc4c9afe79295d8ab031dfc5cd9d180daa9 100644
--- a/shell/common/shell.h
+++ b/shell/common/shell.h
@@ -11,8 +11,13 @@
 #include "flutter/common/settings.h"
 #include "flutter/common/task_runners.h"
 #include "flutter/flow/texture.h"
+#include "flutter/fml/closure.h"
+#include "flutter/fml/macros.h"
+#include "flutter/fml/memory/ref_ptr.h"
 #include "flutter/fml/memory/thread_checker.h"
 #include "flutter/fml/memory/weak_ptr.h"
+#include "flutter/fml/string_view.h"
+#include "flutter/fml/synchronization/thread_annotations.h"
 #include "flutter/fml/synchronization/waitable_event.h"
 #include "flutter/fml/thread.h"
 #include "flutter/lib/ui/semantics/custom_accessibility_action.h"
@@ -25,13 +30,6 @@
 #include "flutter/shell/common/platform_view.h"
 #include "flutter/shell/common/rasterizer.h"
 #include "flutter/shell/common/surface.h"
-#include "lib/fxl/functional/closure.h"
-#include "lib/fxl/macros.h"
-#include "lib/fxl/memory/ref_ptr.h"
-#include "lib/fxl/memory/weak_ptr.h"
-#include "lib/fxl/strings/string_view.h"
-#include "lib/fxl/synchronization/thread_annotations.h"
-#include "lib/fxl/synchronization/thread_checker.h"
 
 namespace shell {
 
@@ -56,8 +54,8 @@ class Shell final : public PlatformView::Delegate,
   static std::unique_ptr<Shell> Create(
       blink::TaskRunners task_runners,
       blink::Settings settings,
-      fxl::RefPtr<blink::DartSnapshot> isolate_snapshot,
-      fxl::RefPtr<blink::DartSnapshot> shared_snapshot,
+      fml::RefPtr<blink::DartSnapshot> isolate_snapshot,
+      fml::RefPtr<blink::DartSnapshot> shared_snapshot,
       CreateCallback<PlatformView> on_create_platform_view,
       CreateCallback<Rasterizer> on_create_rasterizer);
 
@@ -87,14 +85,14 @@ class Shell final : public PlatformView::Delegate,
 
   const blink::TaskRunners task_runners_;
   const blink::Settings settings_;
-  fxl::RefPtr<blink::DartVM> vm_;
+  fml::RefPtr<blink::DartVM> vm_;
   std::unique_ptr<PlatformView> platform_view_;  // on platform task runner
   std::unique_ptr<Engine> engine_;               // on UI task runner
   std::unique_ptr<Rasterizer> rasterizer_;       // on GPU task runner
   std::unique_ptr<IOManager> io_manager_;        // on IO task runner
 
   std::unordered_map<std::string,  // method
-                     std::pair<fxl::RefPtr<fxl::TaskRunner>,
+                     std::pair<fml::RefPtr<fml::TaskRunner>,
                                ServiceProtocolHandler>  // task-runner/function
                                                         // pair
                      >
@@ -106,8 +104,8 @@ class Shell final : public PlatformView::Delegate,
   static std::unique_ptr<Shell> CreateShellOnPlatformThread(
       blink::TaskRunners task_runners,
       blink::Settings settings,
-      fxl::RefPtr<blink::DartSnapshot> isolate_snapshot,
-      fxl::RefPtr<blink::DartSnapshot> shared_snapshot,
+      fml::RefPtr<blink::DartSnapshot> isolate_snapshot,
+      fml::RefPtr<blink::DartSnapshot> shared_snapshot,
       Shell::CreateCallback<PlatformView> on_create_platform_view,
       Shell::CreateCallback<Rasterizer> on_create_rasterizer);
 
@@ -131,7 +129,7 @@ class Shell final : public PlatformView::Delegate,
   // |shell::PlatformView::Delegate|
   void OnPlatformViewDispatchPlatformMessage(
       const PlatformView& view,
-      fxl::RefPtr<blink::PlatformMessage> message) override;
+      fml::RefPtr<blink::PlatformMessage> message) override;
 
   // |shell::PlatformView::Delegate|
   void OnPlatformViewDispatchPointerDataPacket(
@@ -168,11 +166,11 @@ class Shell final : public PlatformView::Delegate,
 
   // |shell::PlatformView::Delegate|
   void OnPlatformViewSetNextFrameCallback(const PlatformView& view,
-                                          fxl::Closure closure) override;
+                                          fml::closure closure) override;
 
   // |shell::Animator::Delegate|
   void OnAnimatorBeginFrame(const Animator& animator,
-                            fxl::TimePoint frame_time) override;
+                            fml::TimePoint frame_time) override;
 
   // |shell::Animator::Delegate|
   void OnAnimatorNotifyIdle(const Animator& animator,
@@ -195,15 +193,15 @@ class Shell final : public PlatformView::Delegate,
   // |shell::Engine::Delegate|
   void OnEngineHandlePlatformMessage(
       const Engine& engine,
-      fxl::RefPtr<blink::PlatformMessage> message) override;
+      fml::RefPtr<blink::PlatformMessage> message) override;
 
   // |blink::ServiceProtocol::Handler|
-  fxl::RefPtr<fxl::TaskRunner> GetServiceProtocolHandlerTaskRunner(
-      fxl::StringView method) const override;
+  fml::RefPtr<fml::TaskRunner> GetServiceProtocolHandlerTaskRunner(
+      fml::StringView method) const override;
 
   // |blink::ServiceProtocol::Handler|
   bool HandleServiceProtocolMessage(
-      fxl::StringView method,  // one if the extension names specified above.
+      fml::StringView method,  // one if the extension names specified above.
       const ServiceProtocolMap& params,
       rapidjson::Document& response) override;
 
@@ -236,7 +234,7 @@ class Shell final : public PlatformView::Delegate,
       const blink::ServiceProtocol::Handler::ServiceProtocolMap& params,
       rapidjson::Document& response);
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(Shell);
+  FML_DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace shell
diff --git a/shell/common/shell_unittests.cc b/shell/common/shell_unittests.cc
index e422f478264ba06e113ace9abfadde2cb260e8b8..6c1cc66c9f6ff3c029aea01e666411c950bc60d3 100644
--- a/shell/common/shell_unittests.cc
+++ b/shell/common/shell_unittests.cc
@@ -25,7 +25,7 @@ namespace shell {
 
 TEST(ShellTest, InitializeWithInvalidThreads) {
   blink::Settings settings = {};
-  settings.task_observer_add = [](intptr_t, fxl::Closure) {};
+  settings.task_observer_add = [](intptr_t, fml::closure) {};
   settings.task_observer_remove = [](intptr_t) {};
   blink::TaskRunners task_runners("test", nullptr, nullptr, nullptr, nullptr);
   auto shell = Shell::Create(
@@ -41,7 +41,7 @@ TEST(ShellTest, InitializeWithInvalidThreads) {
 
 TEST(ShellTest, InitializeWithDifferentThreads) {
   blink::Settings settings = {};
-  settings.task_observer_add = [](intptr_t, fxl::Closure) {};
+  settings.task_observer_add = [](intptr_t, fml::closure) {};
   settings.task_observer_remove = [](intptr_t) {};
   ThreadHost thread_host("io.flutter.test." + CURRENT_TEST_NAME + ".",
                          ThreadHost::Type::Platform | ThreadHost::Type::GPU |
@@ -64,7 +64,7 @@ TEST(ShellTest, InitializeWithDifferentThreads) {
 
 TEST(ShellTest, InitializeWithSingleThread) {
   blink::Settings settings = {};
-  settings.task_observer_add = [](intptr_t, fxl::Closure) {};
+  settings.task_observer_add = [](intptr_t, fml::closure) {};
   settings.task_observer_remove = [](intptr_t) {};
   ThreadHost thread_host("io.flutter.test." + CURRENT_TEST_NAME + ".",
                          ThreadHost::Type::Platform);
@@ -84,7 +84,7 @@ TEST(ShellTest, InitializeWithSingleThread) {
 
 TEST(ShellTest, InitializeWithSingleThreadWhichIsTheCallingThread) {
   blink::Settings settings = {};
-  settings.task_observer_add = [](intptr_t, fxl::Closure) {};
+  settings.task_observer_add = [](intptr_t, fml::closure) {};
   settings.task_observer_remove = [](intptr_t) {};
   fml::MessageLoop::EnsureInitializedForCurrentThread();
   auto task_runner = fml::MessageLoop::GetCurrent().GetTaskRunner();
@@ -103,7 +103,7 @@ TEST(ShellTest, InitializeWithSingleThreadWhichIsTheCallingThread) {
 
 TEST(ShellTest, InitializeWithMultipleThreadButCallingThreadAsPlatformThread) {
   blink::Settings settings = {};
-  settings.task_observer_add = [](intptr_t, fxl::Closure) {};
+  settings.task_observer_add = [](intptr_t, fml::closure) {};
   settings.task_observer_remove = [](intptr_t) {};
   ThreadHost thread_host(
       "io.flutter.test." + CURRENT_TEST_NAME + ".",
diff --git a/shell/common/skia_event_tracer_impl.cc b/shell/common/skia_event_tracer_impl.cc
index 9349b4c2f3f4d737e709da07667f030a4a3a68d6..2f1c386f08a0b8cf0f2e1b729e71d205f11559f3 100644
--- a/shell/common/skia_event_tracer_impl.cc
+++ b/shell/common/skia_event_tracer_impl.cc
@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 #include "third_party/dart/runtime/include/dart_tools_api.h"
 #include "third_party/skia/include/utils/SkEventTracer.h"
 #include "third_party/skia/include/utils/SkTraceEventPhase.h"
@@ -77,7 +77,7 @@ class FlutterEventTracer : public SkEventTracer {
 
  private:
   uint8_t enabled_;
-  FXL_DISALLOW_COPY_AND_ASSIGN(FlutterEventTracer);
+  FML_DISALLOW_COPY_AND_ASSIGN(FlutterEventTracer);
 };
 
 bool enableSkiaTracingCallback(const char* method,
diff --git a/shell/common/surface.cc b/shell/common/surface.cc
index 7101f6e5c40eb90dd261c98e964b8582b9411e1e..f0b3ba19d93aba4a90117230b46ff64546624e04 100644
--- a/shell/common/surface.cc
+++ b/shell/common/surface.cc
@@ -4,7 +4,7 @@
 
 #include "flutter/shell/common/surface.h"
 
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 #include "third_party/skia/include/core/SkColorSpaceXformCanvas.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
@@ -13,7 +13,7 @@ namespace shell {
 SurfaceFrame::SurfaceFrame(sk_sp<SkSurface> surface,
                            SubmitCallback submit_callback)
     : submitted_(false), surface_(surface), submit_callback_(submit_callback) {
-  FXL_DCHECK(submit_callback_);
+  FML_DCHECK(submit_callback_);
   if (surface_) {
     xform_canvas_ = SkCreateColorSpaceXformCanvas(surface_->getCanvas(),
                                                   SkColorSpace::MakeSRGB());
diff --git a/shell/common/surface.h b/shell/common/surface.h
index 8c3d242193c408f44b0adce1c132ea1b2451043b..f178dda441bb4c026c34a527b815269808f5d6e8 100644
--- a/shell/common/surface.h
+++ b/shell/common/surface.h
@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "flutter/flow/compositor_context.h"
-#include "lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
 namespace shell {
@@ -38,7 +38,7 @@ class SurfaceFrame {
 
   bool PerformSubmit();
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(SurfaceFrame);
+  FML_DISALLOW_COPY_AND_ASSIGN(SurfaceFrame);
 };
 
 class Surface {
@@ -54,7 +54,7 @@ class Surface {
   virtual GrContext* GetContext() = 0;
 
  private:
-  FXL_DISALLOW_COPY_AND_ASSIGN(Surface);
+  FML_DISALLOW_COPY_AND_ASSIGN(Surface);
 };
 
 }  // namespace shell
diff --git a/shell/common/switches.cc b/shell/common/switches.cc
index 33752d6f94a4dd91fdb649c9b7666f30fdad63da..e0a7c93271411394311ef7dc25977fb2cd07c756 100644
--- a/shell/common/switches.cc
+++ b/shell/common/switches.cc
@@ -10,7 +10,7 @@
 #include <string>
 
 #include "flutter/fml/paths.h"
-#include "lib/fxl/strings/string_view.h"
+#include "flutter/fml/string_view.h"
 
 // Include once for the default enum definition.
 #include "flutter/shell/common/switches.h"
@@ -19,7 +19,7 @@
 
 struct SwitchDesc {
   shell::Switch sw;
-  const fxl::StringView flag;
+  const fml::StringView flag;
   const char* help;
 };
 
@@ -83,17 +83,17 @@ void PrintUsage(const std::string& executable_name) {
   std::cerr << std::string(column_width, '-') << std::endl;
 }
 
-const fxl::StringView FlagForSwitch(Switch swtch) {
+const fml::StringView FlagForSwitch(Switch swtch) {
   for (uint32_t i = 0; i < static_cast<uint32_t>(Switch::Sentinel); i++) {
     if (gSwitchDescs[i].sw == swtch) {
       return gSwitchDescs[i].flag;
     }
   }
-  return fxl::StringView();
+  return fml::StringView();
 }
 
 template <typename T>
-static bool GetSwitchValue(const fxl::CommandLine& command_line,
+static bool GetSwitchValue(const fml::CommandLine& command_line,
                            shell::Switch sw,
                            T* result) {
   std::string switch_string;
@@ -112,7 +112,7 @@ static bool GetSwitchValue(const fxl::CommandLine& command_line,
   return false;
 }
 
-blink::Settings SettingsFromCommandLine(const fxl::CommandLine& command_line) {
+blink::Settings SettingsFromCommandLine(const fml::CommandLine& command_line) {
   blink::Settings settings = {};
 
   // Enable Observatory
@@ -123,7 +123,7 @@ blink::Settings SettingsFromCommandLine(const fxl::CommandLine& command_line) {
   if (command_line.HasOption(FlagForSwitch(Switch::DeviceObservatoryPort))) {
     if (!GetSwitchValue(command_line, Switch::DeviceObservatoryPort,
                         &settings.observatory_port)) {
-      FXL_LOG(INFO)
+      FML_LOG(INFO)
           << "Observatory port specified was malformed. Will default to "
           << settings.observatory_port;
     }
diff --git a/shell/common/switches.h b/shell/common/switches.h
index 4f694d37475faa05d6fdd84421751c9eab856565..6bae9047e0e3d18a7216056a17cb1c575b38a091 100644
--- a/shell/common/switches.h
+++ b/shell/common/switches.h
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "flutter/common/settings.h"
-#include "lib/fxl/command_line.h"
-#include "lib/fxl/strings/string_view.h"
+#include "flutter/fml/command_line.h"
+#include "flutter/fml/string_view.h"
 
 #ifndef SHELL_COMMON_SWITCHES_H_
 #define SHELL_COMMON_SWITCHES_H_
@@ -133,9 +133,9 @@ DEF_SWITCHES_END
 
 void PrintUsage(const std::string& executable_name);
 
-const fxl::StringView FlagForSwitch(Switch swtch);
+const fml::StringView FlagForSwitch(Switch swtch);
 
-blink::Settings SettingsFromCommandLine(const fxl::CommandLine& command_line);
+blink::Settings SettingsFromCommandLine(const fml::CommandLine& command_line);
 
 }  // namespace shell
 
diff --git a/shell/common/thread_host.h b/shell/common/thread_host.h
index a688aa6a06a85bbfd218b81ff57dc7d284767c50..4fbe0f130910d06a14fc704a08fa1a9f00876376 100644
--- a/shell/common/thread_host.h
+++ b/shell/common/thread_host.h
@@ -7,8 +7,8 @@
 
 #include <memory>
 
+#include "flutter/fml/macros.h"
 #include "flutter/fml/thread.h"
-#include "lib/fxl/macros.h"
 
 namespace shell {
 
diff --git a/shell/common/vsync_waiter.cc b/shell/common/vsync_waiter.cc
index ba2f21c389c11e1828500ea04f086f261718ad55..531698fe9006b8b0330dcac3986082c47e9b3fae 100644
--- a/shell/common/vsync_waiter.cc
+++ b/shell/common/vsync_waiter.cc
@@ -22,8 +22,8 @@ void VsyncWaiter::AsyncWaitForVsync(Callback callback) {
   AwaitVSync();
 }
 
-void VsyncWaiter::FireCallback(fxl::TimePoint frame_start_time,
-                               fxl::TimePoint frame_target_time) {
+void VsyncWaiter::FireCallback(fml::TimePoint frame_start_time,
+                               fml::TimePoint frame_target_time) {
   Callback callback;
 
   {
diff --git a/shell/common/vsync_waiter.h b/shell/common/vsync_waiter.h
index b6d9ee2255abd4148ef6d9ac0c605ba4d546aa8b..a787e3554f993777fd2314b3b2b3365a96275026 100644
--- a/shell/common/vsync_waiter.h
+++ b/shell/common/vsync_waiter.h
@@ -10,21 +10,21 @@
 #include <mutex>
 
 #include "flutter/common/task_runners.h"
-#include "lib/fxl/time/time_point.h"
+#include "flutter/fml/time/time_point.h"
 
 namespace shell {
 
 class VsyncWaiter : public std::enable_shared_from_this<VsyncWaiter> {
  public:
-  using Callback = std::function<void(fxl::TimePoint frame_start_time,
-                                      fxl::TimePoint frame_target_time)>;
+  using Callback = std::function<void(fml::TimePoint frame_start_time,
+                                      fml::TimePoint frame_target_time)>;
 
   virtual ~VsyncWaiter();
 
   void AsyncWaitForVsync(Callback callback);
 
-  void FireCallback(fxl::TimePoint frame_start_time,
-                    fxl::TimePoint frame_target_time);
+  void FireCallback(fml::TimePoint frame_start_time,
+                    fml::TimePoint frame_target_time);
 
  protected:
   const blink::TaskRunners task_runners_;
@@ -35,7 +35,7 @@ class VsyncWaiter : public std::enable_shared_from_this<VsyncWaiter> {
 
   virtual void AwaitVSync() = 0;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(VsyncWaiter);
+  FML_DISALLOW_COPY_AND_ASSIGN(VsyncWaiter);
 };
 
 }  // namespace shell
diff --git a/shell/common/vsync_waiter_fallback.cc b/shell/common/vsync_waiter_fallback.cc
index 31744d59cefbf4df2f35789ca566be08beb9134e..f8e091495e59de2c4bc255209f8c189faeab1c96 100644
--- a/shell/common/vsync_waiter_fallback.cc
+++ b/shell/common/vsync_waiter_fallback.cc
@@ -4,16 +4,16 @@
 
 #include "flutter/shell/common/vsync_waiter_fallback.h"
 
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 
 namespace shell {
 namespace {
 
-fxl::TimePoint SnapToNextTick(fxl::TimePoint value,
-                              fxl::TimePoint tick_phase,
-                              fxl::TimeDelta tick_interval) {
-  fxl::TimeDelta offset = (tick_phase - value) % tick_interval;
-  if (offset != fxl::TimeDelta::Zero())
+fml::TimePoint SnapToNextTick(fml::TimePoint value,
+                              fml::TimePoint tick_phase,
+                              fml::TimeDelta tick_interval) {
+  fml::TimeDelta offset = (tick_phase - value) % tick_interval;
+  if (offset != fml::TimeDelta::Zero())
     offset = offset + tick_interval;
   return value + offset;
 }
@@ -22,22 +22,22 @@ fxl::TimePoint SnapToNextTick(fxl::TimePoint value,
 
 VsyncWaiterFallback::VsyncWaiterFallback(blink::TaskRunners task_runners)
     : VsyncWaiter(std::move(task_runners)),
-      phase_(fxl::TimePoint::Now()),
+      phase_(fml::TimePoint::Now()),
       weak_factory_(this) {}
 
 VsyncWaiterFallback::~VsyncWaiterFallback() = default;
 
-constexpr fxl::TimeDelta interval = fxl::TimeDelta::FromSecondsF(1.0 / 60.0);
+constexpr fml::TimeDelta interval = fml::TimeDelta::FromSecondsF(1.0 / 60.0);
 
 // |shell::VsyncWaiter|
 void VsyncWaiterFallback::AwaitVSync() {
-  fxl::TimePoint now = fxl::TimePoint::Now();
-  fxl::TimePoint next = SnapToNextTick(now, phase_, interval);
+  fml::TimePoint now = fml::TimePoint::Now();
+  fml::TimePoint next = SnapToNextTick(now, phase_, interval);
 
   task_runners_.GetUITaskRunner()->PostDelayedTask(
       [self = weak_factory_.GetWeakPtr()] {
         if (self) {
-          const auto frame_time = fxl::TimePoint::Now();
+          const auto frame_time = fml::TimePoint::Now();
           self->FireCallback(frame_time, frame_time + interval);
         }
       },
diff --git a/shell/common/vsync_waiter_fallback.h b/shell/common/vsync_waiter_fallback.h
index 6fb47658d31ff4b993fa6aec42454cf03fdb476f..1289dd91bd53266034dd72a65c6e29f24a81d5fe 100644
--- a/shell/common/vsync_waiter_fallback.h
+++ b/shell/common/vsync_waiter_fallback.h
@@ -5,10 +5,10 @@
 #ifndef FLUTTER_SHELL_COMMON_VSYNC_WAITER_FALLBACK_H_
 #define FLUTTER_SHELL_COMMON_VSYNC_WAITER_FALLBACK_H_
 
+#include "flutter/fml/macros.h"
+#include "flutter/fml/memory/weak_ptr.h"
+#include "flutter/fml/time/time_point.h"
 #include "flutter/shell/common/vsync_waiter.h"
-#include "lib/fxl/macros.h"
-#include "lib/fxl/memory/weak_ptr.h"
-#include "lib/fxl/time/time_point.h"
 
 namespace shell {
 
@@ -19,13 +19,13 @@ class VsyncWaiterFallback final : public VsyncWaiter {
   ~VsyncWaiterFallback() override;
 
  private:
-  fxl::TimePoint phase_;
-  fxl::WeakPtrFactory<VsyncWaiterFallback> weak_factory_;
+  fml::TimePoint phase_;
+  fml::WeakPtrFactory<VsyncWaiterFallback> weak_factory_;
 
   // |shell::VsyncWaiter|
   void AwaitVSync() override;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(VsyncWaiterFallback);
+  FML_DISALLOW_COPY_AND_ASSIGN(VsyncWaiterFallback);
 };
 
 }  // namespace shell
diff --git a/shell/gpu/gpu.gni b/shell/gpu/gpu.gni
index 502e362e13767ded146c4aa83d6c256d6bea454e..48cb47601750981f9b59c7175e422dd9e678fa2a 100644
--- a/shell/gpu/gpu.gni
+++ b/shell/gpu/gpu.gni
@@ -48,7 +48,6 @@ template("shell_gpu_configuration") {
       "$flutter_root/fml",
       "$flutter_root/shell/common",
       "$flutter_root/synchronization",
-      "//garnet/public/lib/fxl",
       "//third_party/skia",
     ]
 
diff --git a/shell/gpu/gpu_surface_gl.cc b/shell/gpu/gpu_surface_gl.cc
index 7e24bf37ecd73420a5da032272c69f7514058736..5d2ef8d4deec56323cf51ad8329941ca158e77ee 100644
--- a/shell/gpu/gpu_surface_gl.cc
+++ b/shell/gpu/gpu_surface_gl.cc
@@ -4,9 +4,9 @@
 
 #include "gpu_surface_gl.h"
 
+#include "flutter/fml/arraysize.h"
+#include "flutter/fml/logging.h"
 #include "flutter/fml/trace_event.h"
-#include "lib/fxl/arraysize.h"
-#include "lib/fxl/logging.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrBackendSurface.h"
@@ -21,6 +21,10 @@
 #define GPU_GL_RGBA4 0x8056
 #define GPU_GL_RGB565 0x8D62
 
+#ifdef ERROR
+#undef ERROR
+#endif
+
 namespace shell {
 
 // Default maximum number of budgeted resources in the cache.
@@ -33,7 +37,7 @@ static const size_t kGrCacheMaxByteSize = 512 * (1 << 20);
 GPUSurfaceGL::GPUSurfaceGL(GPUSurfaceGLDelegate* delegate)
     : delegate_(delegate), weak_factory_(this) {
   if (!delegate_->GLContextMakeCurrent()) {
-    FXL_LOG(ERROR)
+    FML_LOG(ERROR)
         << "Could not make the context current to setup the gr context.";
     return;
   }
@@ -48,7 +52,7 @@ GPUSurfaceGL::GPUSurfaceGL(GPUSurfaceGLDelegate* delegate)
   auto context = GrContext::MakeGL(GrGLMakeNativeInterface(), options);
 
   if (context == nullptr) {
-    FXL_LOG(ERROR) << "Failed to setup Skia Gr context.";
+    FML_LOG(ERROR) << "Failed to setup Skia Gr context.";
     return;
   }
 
@@ -67,7 +71,7 @@ GPUSurfaceGL::~GPUSurfaceGL() {
   }
 
   if (!delegate_->GLContextMakeCurrent()) {
-    FXL_LOG(ERROR) << "Could not make the context current to destroy the "
+    FML_LOG(ERROR) << "Could not make the context current to destroy the "
                       "GrContext resources.";
     return;
   }
@@ -157,7 +161,7 @@ bool GPUSurfaceGL::CreateOrUpdateSurfaces(const SkISize& size) {
   offscreen_surface_ = nullptr;
 
   if (size.isEmpty()) {
-    FXL_LOG(ERROR) << "Cannot create surfaces of empty size.";
+    FML_LOG(ERROR) << "Cannot create surfaces of empty size.";
     return false;
   }
 
@@ -169,14 +173,14 @@ bool GPUSurfaceGL::CreateOrUpdateSurfaces(const SkISize& size) {
   if (onscreen_surface == nullptr) {
     // If the onscreen surface could not be wrapped. There is absolutely no
     // point in moving forward.
-    FXL_LOG(ERROR) << "Could not wrap onscreen surface.";
+    FML_LOG(ERROR) << "Could not wrap onscreen surface.";
     return false;
   }
 
   if (delegate_->UseOffscreenSurface()) {
     offscreen_surface = CreateOffscreenSurface(context_.get(), size);
     if (offscreen_surface == nullptr) {
-      FXL_LOG(ERROR) << "Could not create offscreen surface.";
+      FML_LOG(ERROR) << "Could not create offscreen surface.";
       return false;
     }
   }
@@ -193,7 +197,7 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceGL::AcquireFrame(const SkISize& size) {
   }
 
   if (!delegate_->GLContextMakeCurrent()) {
-    FXL_LOG(ERROR)
+    FML_LOG(ERROR)
         << "Could not make the context current to acquire the frame.";
     return nullptr;
   }
diff --git a/shell/gpu/gpu_surface_gl.h b/shell/gpu/gpu_surface_gl.h
index abc9f46aee29778f7c2bfd19560c716b3d05ce59..aa1cfd3cd590ee387809ada47edc29d193a91ae0 100644
--- a/shell/gpu/gpu_surface_gl.h
+++ b/shell/gpu/gpu_surface_gl.h
@@ -5,9 +5,9 @@
 #ifndef SHELL_GPU_GPU_SURFACE_GL_H_
 #define SHELL_GPU_GPU_SURFACE_GL_H_
 
+#include "flutter/fml/macros.h"
+#include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/shell/common/surface.h"
-#include "lib/fxl/macros.h"
-#include "lib/fxl/memory/weak_ptr.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 
 namespace shell {
@@ -43,7 +43,7 @@ class GPUSurfaceGL : public Surface {
   sk_sp<SkSurface> onscreen_surface_;
   sk_sp<SkSurface> offscreen_surface_;
   bool valid_ = false;
-  fxl::WeakPtrFactory<GPUSurfaceGL> weak_factory_;
+  fml::WeakPtrFactory<GPUSurfaceGL> weak_factory_;
 
   bool CreateOrUpdateSurfaces(const SkISize& size);
 
@@ -51,7 +51,7 @@ class GPUSurfaceGL : public Surface {
 
   bool PresentSurface(SkCanvas* canvas);
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(GPUSurfaceGL);
+  FML_DISALLOW_COPY_AND_ASSIGN(GPUSurfaceGL);
 };
 
 }  // namespace shell
diff --git a/shell/gpu/gpu_surface_software.cc b/shell/gpu/gpu_surface_software.cc
index 9937135c3913af97cf2112f678c30d0fc63c3206..1d5f851c5bbc51a4cfc160482d239927e7c05fba 100644
--- a/shell/gpu/gpu_surface_software.cc
+++ b/shell/gpu/gpu_surface_software.cc
@@ -5,7 +5,7 @@
 #include "flutter/shell/gpu/gpu_surface_software.h"
 
 #include <memory>
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 
 namespace shell {
 
diff --git a/shell/gpu/gpu_surface_software.h b/shell/gpu/gpu_surface_software.h
index 238754f312b804bd841b158488f75a2758277f3f..ca09537f92e14256bc90c12225e8ac6c358c7393 100644
--- a/shell/gpu/gpu_surface_software.h
+++ b/shell/gpu/gpu_surface_software.h
@@ -5,9 +5,9 @@
 #ifndef FLUTTER_SHELL_GPU_GPU_SURFACE_SOFTWARE_H_
 #define FLUTTER_SHELL_GPU_GPU_SURFACE_SOFTWARE_H_
 
+#include "flutter/fml/macros.h"
+#include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/shell/common/surface.h"
-#include "lib/fxl/macros.h"
-#include "lib/fxl/memory/weak_ptr.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
 namespace shell {
@@ -32,9 +32,9 @@ class GPUSurfaceSoftware : public Surface {
 
  private:
   GPUSurfaceSoftwareDelegate* delegate_;
-  fxl::WeakPtrFactory<GPUSurfaceSoftware> weak_factory_;
+  fml::WeakPtrFactory<GPUSurfaceSoftware> weak_factory_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(GPUSurfaceSoftware);
+  FML_DISALLOW_COPY_AND_ASSIGN(GPUSurfaceSoftware);
 };
 
 }  // namespace shell
diff --git a/shell/gpu/gpu_surface_vulkan.cc b/shell/gpu/gpu_surface_vulkan.cc
index 5787469d4e44bdc922e756dfb5655444a0cafcf6..cf92b921bc8f96bee9795f1a51e1cb7980b428bf 100644
--- a/shell/gpu/gpu_surface_vulkan.cc
+++ b/shell/gpu/gpu_surface_vulkan.cc
@@ -3,12 +3,12 @@
 // found in the LICENSE file.
 
 #include "flutter/shell/gpu/gpu_surface_vulkan.h"
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 
 namespace shell {
 
 GPUSurfaceVulkan::GPUSurfaceVulkan(
-    fxl::RefPtr<vulkan::VulkanProcTable> proc_table,
+    fml::RefPtr<vulkan::VulkanProcTable> proc_table,
     std::unique_ptr<vulkan::VulkanNativeSurface> native_surface)
     : window_(std::move(proc_table), std::move(native_surface)),
       weak_factory_(this) {}
@@ -27,11 +27,9 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceVulkan::AcquireFrame(
     return nullptr;
   }
 
-  SurfaceFrame::SubmitCallback callback = [weak_this =
-                                               weak_factory_.GetWeakPtr()](
-                                              const SurfaceFrame&,
-                                              SkCanvas* canvas)
-                                              ->bool {
+  SurfaceFrame::SubmitCallback callback =
+      [weak_this = weak_factory_.GetWeakPtr()](const SurfaceFrame&,
+                                               SkCanvas* canvas) -> bool {
     // Frames are only ever acquired on the GPU thread. This is also the thread
     // on which the weak pointer factory is collected (as this instance is owned
     // by the rasterizer). So this use of weak pointers is safe.
diff --git a/shell/gpu/gpu_surface_vulkan.h b/shell/gpu/gpu_surface_vulkan.h
index f1e25fbe987b8853edeca0de9c28d02b3eb765d8..996dd13254d2e4033f1a7107961efed9696b4d19 100644
--- a/shell/gpu/gpu_surface_vulkan.h
+++ b/shell/gpu/gpu_surface_vulkan.h
@@ -7,17 +7,17 @@
 
 #include <memory>
 
+#include "flutter/fml/macros.h"
+#include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/shell/common/surface.h"
 #include "flutter/vulkan/vulkan_native_surface.h"
 #include "flutter/vulkan/vulkan_window.h"
-#include "lib/fxl/macros.h"
-#include "lib/fxl/memory/weak_ptr.h"
 
 namespace shell {
 
 class GPUSurfaceVulkan : public Surface {
  public:
-  GPUSurfaceVulkan(fxl::RefPtr<vulkan::VulkanProcTable> proc_table,
+  GPUSurfaceVulkan(fml::RefPtr<vulkan::VulkanProcTable> proc_table,
                    std::unique_ptr<vulkan::VulkanNativeSurface> native_surface);
 
   ~GPUSurfaceVulkan() override;
@@ -30,9 +30,9 @@ class GPUSurfaceVulkan : public Surface {
 
  private:
   vulkan::VulkanWindow window_;
-  fxl::WeakPtrFactory<GPUSurfaceVulkan> weak_factory_;
+  fml::WeakPtrFactory<GPUSurfaceVulkan> weak_factory_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(GPUSurfaceVulkan);
+  FML_DISALLOW_COPY_AND_ASSIGN(GPUSurfaceVulkan);
 };
 
 }  // namespace shell
diff --git a/shell/platform/android/BUILD.gn b/shell/platform/android/BUILD.gn
index b922bf23170f3c67b4a10ec10a3a771343dab7be..29e51b776846b13b8cc1c70cae4979bccd4f7a8c 100644
--- a/shell/platform/android/BUILD.gn
+++ b/shell/platform/android/BUILD.gn
@@ -60,7 +60,6 @@ shared_library("flutter_shell_native") {
     "$flutter_root/lib/ui",
     "$flutter_root/runtime",
     "$flutter_root/shell/common",
-    "//garnet/public/lib/fxl",
     "//third_party/skia",
     "//third_party/skia:gpu",
   ]
diff --git a/shell/platform/android/android_context_gl.cc b/shell/platform/android/android_context_gl.cc
index 6338dc96908e124e0cf888455cd873c6b0ac93f6..08744ace7bc3705ea58e5669de25120a4cc88eae 100644
--- a/shell/platform/android/android_context_gl.cc
+++ b/shell/platform/android/android_context_gl.cc
@@ -50,13 +50,13 @@ static void LogLastEGLError() {
 
   for (size_t i = 0; i < count; i++) {
     if (last_error == pairs[i].code) {
-      FXL_LOG(ERROR) << "EGL Error: " << pairs[i].name << " (" << pairs[i].code
+      FML_LOG(ERROR) << "EGL Error: " << pairs[i].name << " (" << pairs[i].code
                      << ")";
       return;
     }
   }
 
-  FXL_LOG(ERROR) << "Unknown EGL Error";
+  FML_LOG(ERROR) << "Unknown EGL Error";
 }
 
 static EGLResult<EGLSurface> CreateContext(EGLDisplay display,
@@ -115,7 +115,7 @@ static bool TeardownSurface(EGLDisplay display, EGLSurface surface) {
 
 // For onscreen rendering.
 bool AndroidContextGL::CreateWindowSurface(
-    fxl::RefPtr<AndroidNativeWindow> window) {
+    fml::RefPtr<AndroidNativeWindow> window) {
   // The configurations are only required when dealing with extensions or VG.
   // We do neither.
 
@@ -143,7 +143,7 @@ bool AndroidContextGL::CreatePBufferSurface() {
   return surface_ != EGL_NO_SURFACE;
 }
 
-AndroidContextGL::AndroidContextGL(fxl::RefPtr<AndroidEnvironmentGL> env,
+AndroidContextGL::AndroidContextGL(fml::RefPtr<AndroidEnvironmentGL> env,
                                    const AndroidContextGL* share_context)
     : environment_(env),
       window_(nullptr),
@@ -162,7 +162,7 @@ AndroidContextGL::AndroidContextGL(fxl::RefPtr<AndroidEnvironmentGL> env,
   std::tie(success, config_) = ChooseEGLConfiguration(environment_->Display());
 
   if (!success) {
-    FXL_LOG(ERROR) << "Could not choose an EGL configuration.";
+    FML_LOG(ERROR) << "Could not choose an EGL configuration.";
     LogLastEGLError();
     return;
   }
@@ -174,13 +174,13 @@ AndroidContextGL::AndroidContextGL(fxl::RefPtr<AndroidEnvironmentGL> env,
       share_context != nullptr ? share_context->context_ : EGL_NO_CONTEXT);
 
   if (!success) {
-    FXL_LOG(ERROR) << "Could not create an EGL context";
+    FML_LOG(ERROR) << "Could not create an EGL context";
     LogLastEGLError();
     return;
   }
 
   if (!this->CreatePBufferSurface()) {
-    FXL_LOG(ERROR) << "Could not create the EGL surface.";
+    FML_LOG(ERROR) << "Could not create the EGL surface.";
     LogLastEGLError();
     return;
   }
@@ -191,19 +191,19 @@ AndroidContextGL::AndroidContextGL(fxl::RefPtr<AndroidEnvironmentGL> env,
 
 AndroidContextGL::~AndroidContextGL() {
   if (!TeardownContext(environment_->Display(), context_)) {
-    FXL_LOG(ERROR)
+    FML_LOG(ERROR)
         << "Could not tear down the EGL context. Possible resource leak.";
     LogLastEGLError();
   }
 
   if (!TeardownSurface(environment_->Display(), surface_)) {
-    FXL_LOG(ERROR)
+    FML_LOG(ERROR)
         << "Could not tear down the EGL surface. Possible resource leak.";
     LogLastEGLError();
   }
 }
 
-fxl::RefPtr<AndroidEnvironmentGL> AndroidContextGL::Environment() const {
+fml::RefPtr<AndroidEnvironmentGL> AndroidContextGL::Environment() const {
   return environment_;
 }
 
@@ -214,7 +214,7 @@ bool AndroidContextGL::IsValid() const {
 bool AndroidContextGL::MakeCurrent() {
   if (eglMakeCurrent(environment_->Display(), surface_, surface_, context_) !=
       EGL_TRUE) {
-    FXL_LOG(ERROR) << "Could not make the context current";
+    FML_LOG(ERROR) << "Could not make the context current";
     LogLastEGLError();
     return false;
   }
@@ -224,7 +224,7 @@ bool AndroidContextGL::MakeCurrent() {
 bool AndroidContextGL::ClearCurrent() {
   if (eglMakeCurrent(environment_->Display(), EGL_NO_SURFACE, EGL_NO_SURFACE,
                      EGL_NO_CONTEXT) != EGL_TRUE) {
-    FXL_LOG(ERROR) << "Could not clear the current context";
+    FML_LOG(ERROR) << "Could not clear the current context";
     LogLastEGLError();
     return false;
   }
@@ -243,7 +243,7 @@ SkISize AndroidContextGL::GetSize() {
   if (!eglQuerySurface(environment_->Display(), surface_, EGL_WIDTH, &width) ||
       !eglQuerySurface(environment_->Display(), surface_, EGL_HEIGHT,
                        &height)) {
-    FXL_LOG(ERROR) << "Unable to query EGL surface size";
+    FML_LOG(ERROR) << "Unable to query EGL surface size";
     LogLastEGLError();
     return SkISize::Make(0, 0);
   }
@@ -260,7 +260,7 @@ bool AndroidContextGL::Resize(const SkISize& size) {
   TeardownSurface(environment_->Display(), surface_);
 
   if (!this->CreateWindowSurface(window_)) {
-    FXL_LOG(ERROR) << "Unable to create EGL window surface on resize.";
+    FML_LOG(ERROR) << "Unable to create EGL window surface on resize.";
     return false;
   }
 
diff --git a/shell/platform/android/android_context_gl.h b/shell/platform/android/android_context_gl.h
index b29851b34564daf21d0a74fa3fc84d63b9df0e87..7b420211f34df804550790cd54a5a7a867716097 100644
--- a/shell/platform/android/android_context_gl.h
+++ b/shell/platform/android/android_context_gl.h
@@ -5,23 +5,23 @@
 #ifndef FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_CONTEXT_GL_H_
 #define FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_CONTEXT_GL_H_
 
+#include "flutter/fml/macros.h"
+#include "flutter/fml/memory/ref_counted.h"
+#include "flutter/fml/memory/ref_ptr.h"
 #include "flutter/shell/common/platform_view.h"
 #include "flutter/shell/platform/android/android_environment_gl.h"
 #include "flutter/shell/platform/android/android_native_window.h"
-#include "lib/fxl/macros.h"
-#include "lib/fxl/memory/ref_counted.h"
-#include "lib/fxl/memory/ref_ptr.h"
 #include "third_party/skia/include/core/SkSize.h"
 
 namespace shell {
 
-class AndroidContextGL : public fxl::RefCountedThreadSafe<AndroidContextGL> {
+class AndroidContextGL : public fml::RefCountedThreadSafe<AndroidContextGL> {
  public:
-  bool CreateWindowSurface(fxl::RefPtr<AndroidNativeWindow> window);
+  bool CreateWindowSurface(fml::RefPtr<AndroidNativeWindow> window);
 
   bool CreatePBufferSurface();
 
-  fxl::RefPtr<AndroidEnvironmentGL> Environment() const;
+  fml::RefPtr<AndroidEnvironmentGL> Environment() const;
 
   bool IsValid() const;
 
@@ -36,21 +36,21 @@ class AndroidContextGL : public fxl::RefCountedThreadSafe<AndroidContextGL> {
   bool Resize(const SkISize& size);
 
  private:
-  fxl::RefPtr<AndroidEnvironmentGL> environment_;
-  fxl::RefPtr<AndroidNativeWindow> window_;
+  fml::RefPtr<AndroidEnvironmentGL> environment_;
+  fml::RefPtr<AndroidNativeWindow> window_;
   EGLConfig config_;
   EGLSurface surface_;
   EGLContext context_;
   bool valid_;
 
-  AndroidContextGL(fxl::RefPtr<AndroidEnvironmentGL> env,
+  AndroidContextGL(fml::RefPtr<AndroidEnvironmentGL> env,
                    const AndroidContextGL* share_context = nullptr);
 
   ~AndroidContextGL();
 
-  FRIEND_MAKE_REF_COUNTED(AndroidContextGL);
-  FRIEND_REF_COUNTED_THREAD_SAFE(AndroidContextGL);
-  FXL_DISALLOW_COPY_AND_ASSIGN(AndroidContextGL);
+  FML_FRIEND_MAKE_REF_COUNTED(AndroidContextGL);
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(AndroidContextGL);
+  FML_DISALLOW_COPY_AND_ASSIGN(AndroidContextGL);
 };
 
 }  // namespace shell
diff --git a/shell/platform/android/android_environment_gl.h b/shell/platform/android/android_environment_gl.h
index 2bf6a0fdc4745ae0afb7f9c667fbdcb11c9a1c31..3b9124e275de4c84c2226263120c624a8fd133a1 100644
--- a/shell/platform/android/android_environment_gl.h
+++ b/shell/platform/android/android_environment_gl.h
@@ -5,15 +5,15 @@
 #ifndef FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_ENVIRONMENT_GL_H_
 #define FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_ENVIRONMENT_GL_H_
 
-#include "lib/fxl/macros.h"
-#include "lib/fxl/memory/ref_counted.h"
+#include "flutter/fml/macros.h"
+#include "flutter/fml/memory/ref_counted.h"
 
 #include <EGL/egl.h>
 
 namespace shell {
 
 class AndroidEnvironmentGL
-    : public fxl::RefCountedThreadSafe<AndroidEnvironmentGL> {
+    : public fml::RefCountedThreadSafe<AndroidEnvironmentGL> {
  private:
   // MakeRefCounted
   AndroidEnvironmentGL();
@@ -30,9 +30,9 @@ class AndroidEnvironmentGL
   EGLDisplay display_;
   bool valid_;
 
-  FRIEND_MAKE_REF_COUNTED(AndroidEnvironmentGL);
-  FRIEND_REF_COUNTED_THREAD_SAFE(AndroidEnvironmentGL);
-  FXL_DISALLOW_COPY_AND_ASSIGN(AndroidEnvironmentGL);
+  FML_FRIEND_MAKE_REF_COUNTED(AndroidEnvironmentGL);
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(AndroidEnvironmentGL);
+  FML_DISALLOW_COPY_AND_ASSIGN(AndroidEnvironmentGL);
 };
 
 }  // namespace shell
diff --git a/shell/platform/android/android_external_texture_gl.h b/shell/platform/android/android_external_texture_gl.h
index 67d6541d964c25d48966c2abd2122c59a018b63f..98b8f7ae0da88ad8ff663bc1356c4f89ad4e8d75 100644
--- a/shell/platform/android/android_external_texture_gl.h
+++ b/shell/platform/android/android_external_texture_gl.h
@@ -48,7 +48,7 @@ class AndroidExternalTextureGL : public flow::Texture {
 
   SkMatrix transform;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(AndroidExternalTextureGL);
+  FML_DISALLOW_COPY_AND_ASSIGN(AndroidExternalTextureGL);
 };
 
 }  // namespace shell
diff --git a/shell/platform/android/android_native_window.h b/shell/platform/android/android_native_window.h
index 61dedac88f7fc0eac702a18189fa2672945b646c..3337ba228107c36a08251312c50bc8195a9d87e7 100644
--- a/shell/platform/android/android_native_window.h
+++ b/shell/platform/android/android_native_window.h
@@ -6,15 +6,15 @@
 #define FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_NATIVE_WINDOW_H_
 
 #include <android/native_window.h>
-#include "lib/fxl/macros.h"
-#include "lib/fxl/memory/ref_counted.h"
-#include "lib/fxl/memory/ref_ptr.h"
+#include "flutter/fml/macros.h"
+#include "flutter/fml/memory/ref_counted.h"
+#include "flutter/fml/memory/ref_ptr.h"
 #include "third_party/skia/include/core/SkSize.h"
 
 namespace shell {
 
 class AndroidNativeWindow
-    : public fxl::RefCountedThreadSafe<AndroidNativeWindow> {
+    : public fml::RefCountedThreadSafe<AndroidNativeWindow> {
  public:
   using Handle = ANativeWindow*;
 
@@ -33,9 +33,9 @@ class AndroidNativeWindow
 
   ~AndroidNativeWindow();
 
-  FRIEND_MAKE_REF_COUNTED(AndroidNativeWindow);
-  FRIEND_REF_COUNTED_THREAD_SAFE(AndroidNativeWindow);
-  FXL_DISALLOW_COPY_AND_ASSIGN(AndroidNativeWindow);
+  FML_FRIEND_MAKE_REF_COUNTED(AndroidNativeWindow);
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(AndroidNativeWindow);
+  FML_DISALLOW_COPY_AND_ASSIGN(AndroidNativeWindow);
 };
 
 }  // namespace shell
diff --git a/shell/platform/android/android_shell_holder.cc b/shell/platform/android/android_shell_holder.cc
index 248949535d06f925e6759b03b32a7af16dc08790..0420d3ba809670855b8f9d4d708071ea5f555719 100644
--- a/shell/platform/android/android_shell_holder.cc
+++ b/shell/platform/android/android_shell_holder.cc
@@ -14,10 +14,10 @@
 #include <string>
 #include <utility>
 
+#include "flutter/fml/make_copyable.h"
 #include "flutter/fml/message_loop.h"
 #include "flutter/shell/common/rasterizer.h"
 #include "flutter/shell/platform/android/platform_view_android.h"
-#include "lib/fxl/functional/make_copyable.h"
 
 namespace shell {
 
@@ -28,7 +28,7 @@ AndroidShellHolder::AndroidShellHolder(
   static size_t shell_count = 1;
   auto thread_label = std::to_string(shell_count++);
 
-  FXL_CHECK(pthread_key_create(&thread_destruct_key_, ThreadDestructCallback) ==
+  FML_CHECK(pthread_key_create(&thread_destruct_key_, ThreadDestructCallback) ==
             0);
 
   thread_host_ = {thread_label, ThreadHost::Type::UI | ThreadHost::Type::GPU |
@@ -36,7 +36,7 @@ AndroidShellHolder::AndroidShellHolder(
 
   // Detach from JNI when the UI and GPU threads exit.
   auto jni_exit_task([key = thread_destruct_key_]() {
-    FXL_CHECK(pthread_setspecific(key, reinterpret_cast<void*>(1)) == 0);
+    FML_CHECK(pthread_setspecific(key, reinterpret_cast<void*>(1)) == 0);
   });
   thread_host_.ui_thread->GetTaskRunner()->PostTask(jni_exit_task);
   thread_host_.gpu_thread->GetTaskRunner()->PostTask(jni_exit_task);
@@ -79,7 +79,7 @@ AndroidShellHolder::AndroidShellHolder(
       );
 
   platform_view_ = weak_platform_view;
-  FXL_DCHECK(platform_view_);
+  FML_DCHECK(platform_view_);
 
   is_valid_ = shell_ != nullptr;
 
@@ -92,13 +92,13 @@ AndroidShellHolder::AndroidShellHolder(
         // Defensive fallback. Depending on the OEM, it may not be possible
         // to set priority to -5.
         if (::setpriority(PRIO_PROCESS, gettid(), -2) != 0) {
-          FXL_LOG(ERROR) << "Failed to set GPU task runner priority";
+          FML_LOG(ERROR) << "Failed to set GPU task runner priority";
         }
       }
     });
     task_runners.GetUITaskRunner()->PostTask([]() {
       if (::setpriority(PRIO_PROCESS, gettid(), -1) != 0) {
-        FXL_LOG(ERROR) << "Failed to set UI task runner priority";
+        FML_LOG(ERROR) << "Failed to set UI task runner priority";
       }
     });
   }
@@ -107,7 +107,7 @@ AndroidShellHolder::AndroidShellHolder(
 AndroidShellHolder::~AndroidShellHolder() {
   shell_.reset();
   thread_host_.Reset();
-  FXL_CHECK(pthread_key_delete(thread_destruct_key_) == 0);
+  FML_CHECK(pthread_key_delete(thread_destruct_key_) == 0);
 }
 
 void AndroidShellHolder::ThreadDestructCallback(void* value) {
@@ -128,12 +128,12 @@ void AndroidShellHolder::Launch(RunConfiguration config) {
   }
 
   shell_->GetTaskRunners().GetUITaskRunner()->PostTask(
-      fxl::MakeCopyable([engine = shell_->GetEngine(),  //
+      fml::MakeCopyable([engine = shell_->GetEngine(),  //
                          config = std::move(config)     //
   ]() mutable {
         if (engine) {
           if (!engine->Run(std::move(config))) {
-            FXL_LOG(ERROR) << "Could not launch engine in configuration.";
+            FML_LOG(ERROR) << "Could not launch engine in configuration.";
           }
         }
       }));
@@ -159,7 +159,7 @@ void AndroidShellHolder::DispatchPointerDataPacket(
     return;
   }
 
-  shell_->GetTaskRunners().GetUITaskRunner()->PostTask(fxl::MakeCopyable(
+  shell_->GetTaskRunners().GetUITaskRunner()->PostTask(fml::MakeCopyable(
       [engine = shell_->GetEngine(), packet = std::move(packet)] {
         if (engine) {
           engine->DispatchPointerDataPacket(*packet);
@@ -177,7 +177,7 @@ Rasterizer::Screenshot AndroidShellHolder::Screenshot(
 }
 
 fml::WeakPtr<PlatformViewAndroid> AndroidShellHolder::GetPlatformView() {
-  FXL_DCHECK(platform_view_);
+  FML_DCHECK(platform_view_);
   return platform_view_;
 }
 
diff --git a/shell/platform/android/android_shell_holder.h b/shell/platform/android/android_shell_holder.h
index 0163d4bbdc1d012e1823affad6a86a2cf173230b..46492282f7667ec47f33dea1a22c94e8d3268b4c 100644
--- a/shell/platform/android/android_shell_holder.h
+++ b/shell/platform/android/android_shell_holder.h
@@ -7,14 +7,14 @@
 
 #include <memory>
 
+#include "flutter/fml/macros.h"
 #include "flutter/fml/platform/android/jni_weak_ref.h"
+#include "flutter/fml/unique_fd.h"
 #include "flutter/lib/ui/window/viewport_metrics.h"
 #include "flutter/shell/common/run_configuration.h"
 #include "flutter/shell/common/shell.h"
 #include "flutter/shell/common/thread_host.h"
 #include "flutter/shell/platform/android/platform_view_android.h"
-#include "lib/fxl/files/unique_fd.h"
-#include "lib/fxl/macros.h"
 
 namespace shell {
 
@@ -54,7 +54,7 @@ class AndroidShellHolder {
 
   static void ThreadDestructCallback(void* value);
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(AndroidShellHolder);
+  FML_DISALLOW_COPY_AND_ASSIGN(AndroidShellHolder);
 };
 
 }  // namespace shell
diff --git a/shell/platform/android/android_surface.h b/shell/platform/android/android_surface.h
index 858b07eb45d9f2173bd9d6ecb3585b17d00a8106..fc376971b984eef347a701278f9de038d39cefad 100644
--- a/shell/platform/android/android_surface.h
+++ b/shell/platform/android/android_surface.h
@@ -7,12 +7,12 @@
 
 #include <memory>
 
+#include "flutter/fml/macros.h"
 #include "flutter/fml/platform/android/jni_util.h"
 #include "flutter/fml/platform/android/jni_weak_ref.h"
 #include "flutter/shell/common/platform_view.h"
 #include "flutter/shell/common/surface.h"
 #include "flutter/shell/platform/android/android_native_window.h"
-#include "lib/fxl/macros.h"
 #include "third_party/skia/include/core/SkSize.h"
 
 namespace shell {
@@ -33,7 +33,7 @@ class AndroidSurface {
 
   virtual bool ResourceContextMakeCurrent() = 0;
 
-  virtual bool SetNativeWindow(fxl::RefPtr<AndroidNativeWindow> window) = 0;
+  virtual bool SetNativeWindow(fml::RefPtr<AndroidNativeWindow> window) = 0;
 };
 
 }  // namespace shell
diff --git a/shell/platform/android/android_surface_gl.cc b/shell/platform/android/android_surface_gl.cc
index 274b652a97b748714ed6d09150968e90ab84292d..730a1e061b6ce51925bf5c20a87bcb07db1e973c 100644
--- a/shell/platform/android/android_surface_gl.cc
+++ b/shell/platform/android/android_surface_gl.cc
@@ -6,28 +6,28 @@
 
 #include <utility>
 
-#include "lib/fxl/logging.h"
-#include "lib/fxl/memory/ref_ptr.h"
+#include "flutter/fml/logging.h"
+#include "flutter/fml/memory/ref_ptr.h"
 
 namespace shell {
 
-static fxl::RefPtr<AndroidContextGL> GlobalResourceLoadingContext() {
+static fml::RefPtr<AndroidContextGL> GlobalResourceLoadingContext() {
   // AndroidSurfaceGL instances are only ever created on the platform thread. So
   // there is no need to lock here.
 
-  static fxl::RefPtr<AndroidContextGL> global_context;
+  static fml::RefPtr<AndroidContextGL> global_context;
 
   if (global_context) {
     return global_context;
   }
 
-  auto environment = fxl::MakeRefCounted<AndroidEnvironmentGL>();
+  auto environment = fml::MakeRefCounted<AndroidEnvironmentGL>();
 
   if (!environment->IsValid()) {
     return nullptr;
   }
 
-  auto context = fxl::MakeRefCounted<AndroidContextGL>(environment);
+  auto context = fml::MakeRefCounted<AndroidContextGL>(environment);
 
   if (!context->IsValid()) {
     return nullptr;
@@ -73,17 +73,17 @@ std::unique_ptr<Surface> AndroidSurfaceGL::CreateGPUSurface() {
 }
 
 bool AndroidSurfaceGL::OnScreenSurfaceResize(const SkISize& size) const {
-  FXL_DCHECK(onscreen_context_ && onscreen_context_->IsValid());
+  FML_DCHECK(onscreen_context_ && onscreen_context_->IsValid());
   return onscreen_context_->Resize(size);
 }
 
 bool AndroidSurfaceGL::ResourceContextMakeCurrent() {
-  FXL_DCHECK(offscreen_context_ && offscreen_context_->IsValid());
+  FML_DCHECK(offscreen_context_ && offscreen_context_->IsValid());
   return offscreen_context_->MakeCurrent();
 }
 
 bool AndroidSurfaceGL::SetNativeWindow(
-    fxl::RefPtr<AndroidNativeWindow> window) {
+    fml::RefPtr<AndroidNativeWindow> window) {
   // In any case, we want to get rid of our current onscreen context.
   onscreen_context_ = nullptr;
 
@@ -94,7 +94,7 @@ bool AndroidSurfaceGL::SetNativeWindow(
   }
 
   // Create the onscreen context.
-  onscreen_context_ = fxl::MakeRefCounted<AndroidContextGL>(
+  onscreen_context_ = fml::MakeRefCounted<AndroidContextGL>(
       offscreen_context_->Environment(),
       offscreen_context_.get() /* sharegroup */);
 
@@ -112,22 +112,22 @@ bool AndroidSurfaceGL::SetNativeWindow(
 }
 
 bool AndroidSurfaceGL::GLContextMakeCurrent() {
-  FXL_DCHECK(onscreen_context_ && onscreen_context_->IsValid());
+  FML_DCHECK(onscreen_context_ && onscreen_context_->IsValid());
   return onscreen_context_->MakeCurrent();
 }
 
 bool AndroidSurfaceGL::GLContextClearCurrent() {
-  FXL_DCHECK(onscreen_context_ && onscreen_context_->IsValid());
+  FML_DCHECK(onscreen_context_ && onscreen_context_->IsValid());
   return onscreen_context_->ClearCurrent();
 }
 
 bool AndroidSurfaceGL::GLContextPresent() {
-  FXL_DCHECK(onscreen_context_ && onscreen_context_->IsValid());
+  FML_DCHECK(onscreen_context_ && onscreen_context_->IsValid());
   return onscreen_context_->SwapBuffers();
 }
 
 intptr_t AndroidSurfaceGL::GLContextFBO() const {
-  FXL_DCHECK(onscreen_context_ && onscreen_context_->IsValid());
+  FML_DCHECK(onscreen_context_ && onscreen_context_->IsValid());
   // The default window bound framebuffer on Android.
   return 0;
 }
diff --git a/shell/platform/android/android_surface_gl.h b/shell/platform/android/android_surface_gl.h
index e26f2bf50d3a938a241a4de1648f5589b7bf4fcc..02049146bf7ab1ec93b602877f387e2d0679ca28 100644
--- a/shell/platform/android/android_surface_gl.h
+++ b/shell/platform/android/android_surface_gl.h
@@ -8,11 +8,11 @@
 #include <jni.h>
 #include <memory>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/gpu/gpu_surface_gl.h"
 #include "flutter/shell/platform/android/android_context_gl.h"
 #include "flutter/shell/platform/android/android_environment_gl.h"
 #include "flutter/shell/platform/android/android_surface.h"
-#include "lib/fxl/macros.h"
 
 namespace shell {
 
@@ -41,7 +41,7 @@ class AndroidSurfaceGL final : public GPUSurfaceGLDelegate,
   bool ResourceContextMakeCurrent() override;
 
   // |shell::AndroidSurface|
-  bool SetNativeWindow(fxl::RefPtr<AndroidNativeWindow> window) override;
+  bool SetNativeWindow(fml::RefPtr<AndroidNativeWindow> window) override;
 
   // |shell::GPUSurfaceGLDelegate|
   bool GLContextMakeCurrent() override;
@@ -56,11 +56,11 @@ class AndroidSurfaceGL final : public GPUSurfaceGLDelegate,
   intptr_t GLContextFBO() const override;
 
  private:
-  fxl::RefPtr<AndroidContextGL> onscreen_context_;
-  fxl::RefPtr<AndroidContextGL> offscreen_context_;
+  fml::RefPtr<AndroidContextGL> onscreen_context_;
+  fml::RefPtr<AndroidContextGL> offscreen_context_;
   sk_sp<GrContext> gr_context_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(AndroidSurfaceGL);
+  FML_DISALLOW_COPY_AND_ASSIGN(AndroidSurfaceGL);
 };
 
 }  // namespace shell
diff --git a/shell/platform/android/android_surface_software.cc b/shell/platform/android/android_surface_software.cc
index 4b1378802d9e47f375e33b622925cbe3492a5d58..2335cca995bc83ae35d87c30d150adbb4a7a65a8 100644
--- a/shell/platform/android/android_surface_software.cc
+++ b/shell/platform/android/android_surface_software.cc
@@ -7,11 +7,11 @@
 #include <memory>
 #include <vector>
 
+#include "flutter/fml/logging.h"
 #include "flutter/fml/platform/android/jni_weak_ref.h"
 #include "flutter/fml/platform/android/scoped_java_ref.h"
 #include "flutter/fml/trace_event.h"
 #include "flutter/shell/platform/android/platform_view_android_jni.h"
-#include "lib/fxl/logging.h"
 
 namespace shell {
 
@@ -136,7 +136,7 @@ bool AndroidSurfaceSoftware::OnScreenSurfaceResize(const SkISize& size) const {
 }
 
 bool AndroidSurfaceSoftware::SetNativeWindow(
-    fxl::RefPtr<AndroidNativeWindow> window) {
+    fml::RefPtr<AndroidNativeWindow> window) {
   native_window_ = std::move(window);
   if (!(native_window_ && native_window_->IsValid()))
     return false;
diff --git a/shell/platform/android/android_surface_software.h b/shell/platform/android/android_surface_software.h
index 0f82fc5dfe1543644af4bed4f580cffd651a5a57..2b14f65f5ae85541469ebdd57b9c0f9d16911c92 100644
--- a/shell/platform/android/android_surface_software.h
+++ b/shell/platform/android/android_surface_software.h
@@ -5,11 +5,11 @@
 #ifndef FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_SURFACE_SOFTWARE_H_
 #define FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_SURFACE_SOFTWARE_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/fml/platform/android/jni_weak_ref.h"
 #include "flutter/fml/platform/android/scoped_java_ref.h"
 #include "flutter/shell/gpu/gpu_surface_software.h"
 #include "flutter/shell/platform/android/android_surface.h"
-#include "lib/fxl/macros.h"
 
 namespace shell {
 
@@ -36,7 +36,7 @@ class AndroidSurfaceSoftware final : public AndroidSurface,
   bool OnScreenSurfaceResize(const SkISize& size) const override;
 
   // |shell::AndroidSurface|
-  bool SetNativeWindow(fxl::RefPtr<AndroidNativeWindow> window) override;
+  bool SetNativeWindow(fml::RefPtr<AndroidNativeWindow> window) override;
 
   // |shell::GPUSurfaceSoftwareDelegate|
   sk_sp<SkSurface> AcquireBackingStore(const SkISize& size) override;
@@ -46,11 +46,11 @@ class AndroidSurfaceSoftware final : public AndroidSurface,
 
  private:
   sk_sp<SkSurface> sk_surface_;
-  fxl::RefPtr<AndroidNativeWindow> native_window_;
+  fml::RefPtr<AndroidNativeWindow> native_window_;
   SkColorType target_color_type_;
   SkAlphaType target_alpha_type_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(AndroidSurfaceSoftware);
+  FML_DISALLOW_COPY_AND_ASSIGN(AndroidSurfaceSoftware);
 };
 
 }  // namespace shell
diff --git a/shell/platform/android/android_surface_vulkan.cc b/shell/platform/android/android_surface_vulkan.cc
index e8817690188c2b4189d876bde86c8f01b478ca2c..33bf9705b747d41a802cb2a375d4792da49b5ee8 100644
--- a/shell/platform/android/android_surface_vulkan.cc
+++ b/shell/platform/android/android_surface_vulkan.cc
@@ -6,14 +6,14 @@
 
 #include <utility>
 
+#include "flutter/fml/logging.h"
 #include "flutter/shell/gpu/gpu_surface_vulkan.h"
 #include "flutter/vulkan/vulkan_native_surface_android.h"
-#include "lib/fxl/logging.h"
 
 namespace shell {
 
 AndroidSurfaceVulkan::AndroidSurfaceVulkan()
-    : proc_table_(fxl::MakeRefCounted<vulkan::VulkanProcTable>()) {}
+    : proc_table_(fml::MakeRefCounted<vulkan::VulkanProcTable>()) {}
 
 AndroidSurfaceVulkan::~AndroidSurfaceVulkan() = default;
 
@@ -61,13 +61,13 @@ bool AndroidSurfaceVulkan::OnScreenSurfaceResize(const SkISize& size) const {
 
 // |shell::AndroidSurface|
 bool AndroidSurfaceVulkan::ResourceContextMakeCurrent() {
-  FXL_DLOG(ERROR) << "The vulkan backend does not support resource contexts.";
+  FML_DLOG(ERROR) << "The vulkan backend does not support resource contexts.";
   return false;
 }
 
 // |shell::AndroidSurface|
 bool AndroidSurfaceVulkan::SetNativeWindow(
-    fxl::RefPtr<AndroidNativeWindow> window) {
+    fml::RefPtr<AndroidNativeWindow> window) {
   native_window_ = std::move(window);
   return native_window_ && native_window_->IsValid();
 }
diff --git a/shell/platform/android/android_surface_vulkan.h b/shell/platform/android/android_surface_vulkan.h
index fd3f493d497904b1f2f860b655ab6923dab6285a..79d83b57c63a2d01b4df7ca9d0399b7044a5d5b5 100644
--- a/shell/platform/android/android_surface_vulkan.h
+++ b/shell/platform/android/android_surface_vulkan.h
@@ -7,10 +7,10 @@
 
 #include <jni.h>
 #include <memory>
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/android/android_native_window.h"
 #include "flutter/shell/platform/android/android_surface.h"
 #include "flutter/vulkan/vulkan_window.h"
-#include "lib/fxl/macros.h"
 
 namespace shell {
 
@@ -36,13 +36,13 @@ class AndroidSurfaceVulkan : public AndroidSurface {
   bool ResourceContextMakeCurrent() override;
 
   // |shell::AndroidSurface|
-  bool SetNativeWindow(fxl::RefPtr<AndroidNativeWindow> window) override;
+  bool SetNativeWindow(fml::RefPtr<AndroidNativeWindow> window) override;
 
  private:
-  fxl::RefPtr<vulkan::VulkanProcTable> proc_table_;
-  fxl::RefPtr<AndroidNativeWindow> native_window_;
+  fml::RefPtr<vulkan::VulkanProcTable> proc_table_;
+  fml::RefPtr<AndroidNativeWindow> native_window_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(AndroidSurfaceVulkan);
+  FML_DISALLOW_COPY_AND_ASSIGN(AndroidSurfaceVulkan);
 };
 
 }  // namespace shell
diff --git a/shell/platform/android/apk_asset_provider.cc b/shell/platform/android/apk_asset_provider.cc
index 27f524cc0b746323c6dfe4247413a72a0d614780..446d8b4e57a4fb5b8df1c120c9b450b46b3b378b 100644
--- a/shell/platform/android/apk_asset_provider.cc
+++ b/shell/platform/android/apk_asset_provider.cc
@@ -2,8 +2,8 @@
 #include <algorithm>
 #include <sstream>
 
+#include "flutter/fml/logging.h"
 #include "flutter/shell/platform/android/apk_asset_provider.h"
-#include "lib/fxl/logging.h"
 
 namespace blink {
 
diff --git a/shell/platform/android/apk_asset_provider.h b/shell/platform/android/apk_asset_provider.h
index 81164733a536516e140cf1c4e155bbe82870f1ab..e425ad205c575c5538af537bee1193ae519b3014 100644
--- a/shell/platform/android/apk_asset_provider.h
+++ b/shell/platform/android/apk_asset_provider.h
@@ -9,8 +9,8 @@
 #include <jni.h>
 
 #include "flutter/assets/asset_resolver.h"
+#include "flutter/fml/memory/ref_counted.h"
 #include "flutter/fml/platform/android/scoped_java_ref.h"
-#include "lib/fxl/memory/ref_counted.h"
 
 namespace blink {
 
@@ -33,7 +33,7 @@ class APKAssetProvider final : public AssetResolver {
   std::unique_ptr<fml::Mapping> GetAsMapping(
       const std::string& asset_name) const override;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(APKAssetProvider);
+  FML_DISALLOW_COPY_AND_ASSIGN(APKAssetProvider);
 };
 
 }  // namespace blink
diff --git a/shell/platform/android/flutter_main.cc b/shell/platform/android/flutter_main.cc
index 1849c83984bce0ea51045160525ece91b97384cc..2a9a46a97b3a9b40d2003be47ed51cd2f6825ef3 100644
--- a/shell/platform/android/flutter_main.cc
+++ b/shell/platform/android/flutter_main.cc
@@ -8,6 +8,10 @@
 
 #include <vector>
 
+#include "flutter/fml/arraysize.h"
+#include "flutter/fml/command_line.h"
+#include "flutter/fml/file.h"
+#include "flutter/fml/macros.h"
 #include "flutter/fml/message_loop.h"
 #include "flutter/fml/paths.h"
 #include "flutter/fml/platform/android/jni_util.h"
@@ -15,10 +19,6 @@
 #include "flutter/runtime/start_up.h"
 #include "flutter/shell/common/shell.h"
 #include "flutter/shell/common/switches.h"
-#include "lib/fxl/arraysize.h"
-#include "lib/fxl/command_line.h"
-#include "lib/fxl/files/file.h"
-#include "lib/fxl/macros.h"
 #include "third_party/dart/runtime/include/dart_tools_api.h"
 
 namespace shell {
@@ -31,7 +31,7 @@ FlutterMain::~FlutterMain() = default;
 static std::unique_ptr<FlutterMain> g_flutter_main;
 
 FlutterMain& FlutterMain::Get() {
-  FXL_CHECK(g_flutter_main) << "ensureInitializationComplete must have already "
+  FML_CHECK(g_flutter_main) << "ensureInitializationComplete must have already "
                                "been called.";
   return *g_flutter_main;
 }
@@ -50,7 +50,7 @@ void FlutterMain::Init(JNIEnv* env,
   for (auto& arg : fml::jni::StringArrayToVector(env, jargs)) {
     args.push_back(std::move(arg));
   }
-  auto command_line = fxl::CommandLineFromIterators(args.begin(), args.end());
+  auto command_line = fml::CommandLineFromIterators(args.begin(), args.end());
 
   auto settings = SettingsFromCommandLine(command_line);
 
@@ -64,15 +64,15 @@ void FlutterMain::Init(JNIEnv* env,
     auto application_kernel_path =
         fml::paths::JoinPaths({settings.assets_path, "kernel_blob.bin"});
 
-    if (files::IsFile(application_kernel_path)) {
+    if (fml::IsFile(application_kernel_path)) {
       settings.application_kernel_asset = application_kernel_path;
-      if (files::IsFile(platform_kernel_path)) {
+      if (fml::IsFile(platform_kernel_path)) {
         settings.platform_kernel_path = platform_kernel_path;
       }
     }
   }
 
-  settings.task_observer_add = [](intptr_t key, fxl::Closure callback) {
+  settings.task_observer_add = [](intptr_t key, fml::closure callback) {
     fml::MessageLoop::GetCurrent().AddTaskObserver(key, std::move(callback));
   };
 
diff --git a/shell/platform/android/flutter_main.h b/shell/platform/android/flutter_main.h
index 6c8717e9cebdb4aba0acf0389b371dcea29c6441..acd4a46366bd466a6825ff007895b8f13b43d1b8 100644
--- a/shell/platform/android/flutter_main.h
+++ b/shell/platform/android/flutter_main.h
@@ -8,7 +8,7 @@
 #include <jni.h>
 
 #include "flutter/common/settings.h"
-#include "lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 
 namespace shell {
 
@@ -33,7 +33,7 @@ class FlutterMain {
                    jobjectArray jargs,
                    jstring bundlePath);
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(FlutterMain);
+  FML_DISALLOW_COPY_AND_ASSIGN(FlutterMain);
 };
 
 }  // namespace shell
diff --git a/shell/platform/android/library_loader.cc b/shell/platform/android/library_loader.cc
index 569825ce33e21475cfefec926bdc8d69c6978008..70a2b5af34da2b4d544b7bfa54afcee8fe08f0af 100644
--- a/shell/platform/android/library_loader.cc
+++ b/shell/platform/android/library_loader.cc
@@ -17,15 +17,15 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
 
   // Register FlutterMain.
   result = shell::FlutterMain::Register(env);
-  FXL_CHECK(result);
+  FML_CHECK(result);
 
   // Register PlatformView
   result = shell::PlatformViewAndroid::Register(env);
-  FXL_CHECK(result);
+  FML_CHECK(result);
 
   // Register VSyncWaiter.
   result = shell::VsyncWaiterAndroid::Register(env);
-  FXL_CHECK(result);
+  FML_CHECK(result);
 
   return JNI_VERSION_1_4;
 }
diff --git a/shell/platform/android/platform_message_response_android.cc b/shell/platform/android/platform_message_response_android.cc
index a625cdcb6d2333592814c2c5f6aaa687547d6537..3610d8baa0d7309e872d44d4a6549d7ecf5b80a3 100644
--- a/shell/platform/android/platform_message_response_android.cc
+++ b/shell/platform/android/platform_message_response_android.cc
@@ -4,15 +4,15 @@
 
 #include "flutter/shell/platform/android/platform_message_response_android.h"
 
+#include "flutter/fml/make_copyable.h"
 #include "flutter/shell/platform/android/platform_view_android_jni.h"
-#include "lib/fxl/functional/make_copyable.h"
 
 namespace shell {
 
 PlatformMessageResponseAndroid::PlatformMessageResponseAndroid(
     int response_id,
     fml::jni::JavaObjectWeakGlobalRef weak_java_object,
-    fxl::RefPtr<fxl::TaskRunner> platform_task_runner)
+    fml::RefPtr<fml::TaskRunner> platform_task_runner)
     : response_id_(response_id),
       weak_java_object_(weak_java_object),
       platform_task_runner_(std::move(platform_task_runner)) {}
@@ -21,7 +21,7 @@ PlatformMessageResponseAndroid::PlatformMessageResponseAndroid(
 void PlatformMessageResponseAndroid::Complete(
     std::unique_ptr<fml::Mapping> data) {
   platform_task_runner_->PostTask(
-      fxl::MakeCopyable([response = response_id_,               //
+      fml::MakeCopyable([response = response_id_,               //
                          weak_java_object = weak_java_object_,  //
                          data = std::move(data)                 //
   ]() {
@@ -52,7 +52,7 @@ void PlatformMessageResponseAndroid::Complete(
 // |blink::PlatformMessageResponse|
 void PlatformMessageResponseAndroid::CompleteEmpty() {
   platform_task_runner_->PostTask(
-      fxl::MakeCopyable([response = response_id_,              //
+      fml::MakeCopyable([response = response_id_,              //
                          weak_java_object = weak_java_object_  //
   ]() {
         // We are on the platform thread. Attempt to get the strong reference to
diff --git a/shell/platform/android/platform_message_response_android.h b/shell/platform/android/platform_message_response_android.h
index bca5c5e123e9e190b62999945dc7f6d85b196bfd..fb4c5ac6406455683dce84fac0be45ae38f36d98 100644
--- a/shell/platform/android/platform_message_response_android.h
+++ b/shell/platform/android/platform_message_response_android.h
@@ -5,10 +5,10 @@
 #ifndef FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_MESSAGE_RESPONSE_ANDROID_H_
 #define FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_MESSAGE_RESPONSE_ANDROID_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/fml/platform/android/jni_weak_ref.h"
 #include "flutter/fml/task_runner.h"
 #include "flutter/lib/ui/window/platform_message_response.h"
-#include "lib/fxl/macros.h"
 
 namespace shell {
 
@@ -24,14 +24,14 @@ class PlatformMessageResponseAndroid : public blink::PlatformMessageResponse {
   PlatformMessageResponseAndroid(
       int response_id,
       fml::jni::JavaObjectWeakGlobalRef weak_java_object,
-      fxl::RefPtr<fxl::TaskRunner> platform_task_runner);
+      fml::RefPtr<fml::TaskRunner> platform_task_runner);
 
   int response_id_;
   fml::jni::JavaObjectWeakGlobalRef weak_java_object_;
-  fxl::RefPtr<fxl::TaskRunner> platform_task_runner_;
+  fml::RefPtr<fml::TaskRunner> platform_task_runner_;
 
-  FRIEND_MAKE_REF_COUNTED(PlatformMessageResponseAndroid);
-  FXL_DISALLOW_COPY_AND_ASSIGN(PlatformMessageResponseAndroid);
+  FML_FRIEND_MAKE_REF_COUNTED(PlatformMessageResponseAndroid);
+  FML_DISALLOW_COPY_AND_ASSIGN(PlatformMessageResponseAndroid);
 };
 
 }  // namespace shell
diff --git a/shell/platform/android/platform_view_android.cc b/shell/platform/android/platform_view_android.cc
index f34dd1c711156fcbb4afe2b5d9d31e30e869df16..808b5fa72a32b64bf3537fe4855cffac9093d0c2 100644
--- a/shell/platform/android/platform_view_android.cc
+++ b/shell/platform/android/platform_view_android.cc
@@ -25,7 +25,7 @@ PlatformViewAndroid::PlatformViewAndroid(
     : PlatformView(delegate, std::move(task_runners)),
       java_object_(java_object),
       android_surface_(AndroidSurface::Create(use_software_rendering)) {
-  FXL_CHECK(android_surface_)
+  FML_CHECK(android_surface_)
       << "Could not create an OpenGL, Vulkan or Software surface to setup "
          "rendering.";
 }
@@ -33,7 +33,7 @@ PlatformViewAndroid::PlatformViewAndroid(
 PlatformViewAndroid::~PlatformViewAndroid() = default;
 
 void PlatformViewAndroid::NotifyCreated(
-    fxl::RefPtr<AndroidNativeWindow> native_window) {
+    fml::RefPtr<AndroidNativeWindow> native_window) {
   InstallFirstFrameCallback();
   android_surface_->SetNativeWindow(native_window);
   PlatformView::NotifyCreated();
@@ -65,28 +65,28 @@ void PlatformViewAndroid::DispatchPlatformMessage(JNIEnv* env,
   std::vector<uint8_t> message =
       std::vector<uint8_t>(message_data, message_data + java_message_position);
 
-  fxl::RefPtr<blink::PlatformMessageResponse> response;
+  fml::RefPtr<blink::PlatformMessageResponse> response;
   if (response_id) {
-    response = fxl::MakeRefCounted<PlatformMessageResponseAndroid>(
+    response = fml::MakeRefCounted<PlatformMessageResponseAndroid>(
         response_id, java_object_, task_runners_.GetPlatformTaskRunner());
   }
 
   PlatformView::DispatchPlatformMessage(
-      fxl::MakeRefCounted<blink::PlatformMessage>(
+      fml::MakeRefCounted<blink::PlatformMessage>(
           std::move(name), std::move(message), std::move(response)));
 }
 
 void PlatformViewAndroid::DispatchEmptyPlatformMessage(JNIEnv* env,
                                                        std::string name,
                                                        jint response_id) {
-  fxl::RefPtr<blink::PlatformMessageResponse> response;
+  fml::RefPtr<blink::PlatformMessageResponse> response;
   if (response_id) {
-    response = fxl::MakeRefCounted<PlatformMessageResponseAndroid>(
+    response = fml::MakeRefCounted<PlatformMessageResponseAndroid>(
         response_id, java_object_, task_runners_.GetPlatformTaskRunner());
   }
 
   PlatformView::DispatchPlatformMessage(
-      fxl::MakeRefCounted<blink::PlatformMessage>(std::move(name),
+      fml::MakeRefCounted<blink::PlatformMessage>(std::move(name),
                                                   std::move(response)));
 }
 
@@ -125,7 +125,7 @@ void PlatformViewAndroid::InvokePlatformMessageEmptyResponseCallback(
 
 // |shell::PlatformView|
 void PlatformViewAndroid::HandlePlatformMessage(
-    fxl::RefPtr<blink::PlatformMessage> message) {
+    fml::RefPtr<blink::PlatformMessage> message) {
   JNIEnv* env = fml::jni::AttachCurrentThread();
   fml::jni::ScopedJavaLocalRef<jobject> view = java_object_.get(env);
   if (view.is_null())
@@ -347,7 +347,7 @@ sk_sp<GrContext> PlatformViewAndroid::CreateResourceContext() const {
     resource_context = IOManager::CreateCompatibleResourceLoadingContext(
         GrBackend::kOpenGL_GrBackend);
   } else {
-    FXL_DLOG(ERROR) << "Could not make the resource context current.";
+    FML_DLOG(ERROR) << "Could not make the resource context current.";
   }
 
   return resource_context;
diff --git a/shell/platform/android/platform_view_android.h b/shell/platform/android/platform_view_android.h
index b93a9834f3a25a840a436b1281e778e059b46761..be7cf2c1973227bbf2c55f143c5b551848a90a6c 100644
--- a/shell/platform/android/platform_view_android.h
+++ b/shell/platform/android/platform_view_android.h
@@ -10,13 +10,13 @@
 #include <unordered_map>
 #include <vector>
 
+#include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/platform/android/jni_weak_ref.h"
 #include "flutter/fml/platform/android/scoped_java_ref.h"
 #include "flutter/lib/ui/window/platform_message.h"
 #include "flutter/shell/common/platform_view.h"
 #include "flutter/shell/platform/android/android_native_window.h"
 #include "flutter/shell/platform/android/android_surface.h"
-#include "lib/fxl/memory/weak_ptr.h"
 
 namespace shell {
 
@@ -31,7 +31,7 @@ class PlatformViewAndroid final : public PlatformView {
 
   ~PlatformViewAndroid() override;
 
-  void NotifyCreated(fxl::RefPtr<AndroidNativeWindow> native_window);
+  void NotifyCreated(fml::RefPtr<AndroidNativeWindow> native_window);
 
   void NotifyChanged(const SkISize& size);
 
@@ -71,16 +71,17 @@ class PlatformViewAndroid final : public PlatformView {
   const std::unique_ptr<AndroidSurface> android_surface_;
   // We use id 0 to mean that no response is expected.
   int next_response_id_ = 1;
-  std::unordered_map<int, fxl::RefPtr<blink::PlatformMessageResponse>>
+  std::unordered_map<int, fml::RefPtr<blink::PlatformMessageResponse>>
       pending_responses_;
 
   // |shell::PlatformView|
-  void UpdateSemantics(blink::SemanticsNodeUpdates update,
-                       blink::CustomAccessibilityActionUpdates actions) override;
+  void UpdateSemantics(
+      blink::SemanticsNodeUpdates update,
+      blink::CustomAccessibilityActionUpdates actions) override;
 
   // |shell::PlatformView|
   void HandlePlatformMessage(
-      fxl::RefPtr<blink::PlatformMessage> message) override;
+      fml::RefPtr<blink::PlatformMessage> message) override;
 
   // |shell::PlatformView|
   std::unique_ptr<VsyncWaiter> CreateVSyncWaiter() override;
@@ -95,7 +96,7 @@ class PlatformViewAndroid final : public PlatformView {
 
   void FireFirstFrameCallback();
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(PlatformViewAndroid);
+  FML_DISALLOW_COPY_AND_ASSIGN(PlatformViewAndroid);
 };
 
 }  // namespace shell
diff --git a/shell/platform/android/platform_view_android_jni.cc b/shell/platform/android/platform_view_android_jni.cc
index a88d5c0306be8b04f15679c25f754c3ccaad9746..57f9cc073afeda89430e930ddeedc8215ca93631 100644
--- a/shell/platform/android/platform_view_android_jni.cc
+++ b/shell/platform/android/platform_view_android_jni.cc
@@ -11,6 +11,7 @@
 #include "flutter/assets/directory_asset_bundle.h"
 #include "flutter/assets/zip_asset_store.h"
 #include "flutter/common/settings.h"
+#include "flutter/fml/arraysize.h"
 #include "flutter/fml/file.h"
 #include "flutter/fml/platform/android/jni_util.h"
 #include "flutter/fml/platform/android/jni_weak_ref.h"
@@ -21,7 +22,6 @@
 #include "flutter/shell/platform/android/android_shell_holder.h"
 #include "flutter/shell/platform/android/apk_asset_provider.h"
 #include "flutter/shell/platform/android/flutter_main.h"
-#include "lib/fxl/arraysize.h"
 
 #define ANDROID_SHELL_HOLDER \
   (reinterpret_cast<shell::AndroidShellHolder*>(shell_holder))
@@ -36,7 +36,7 @@ bool CheckException(JNIEnv* env) {
 
   jthrowable exception = env->ExceptionOccurred();
   env->ExceptionClear();
-  FXL_LOG(INFO) << fml::jni::GetJavaExceptionInfo(env, exception);
+  FML_LOG(INFO) << fml::jni::GetJavaExceptionInfo(env, exception);
   env->DeleteLocalRef(exception);
   return false;
 }
@@ -58,7 +58,7 @@ void FlutterViewHandlePlatformMessage(JNIEnv* env,
                                       jint responseId) {
   env->CallVoidMethod(obj, g_handle_platform_message_method, channel, message,
                       responseId);
-  FXL_CHECK(CheckException(env));
+  FML_CHECK(CheckException(env));
 }
 
 static jmethodID g_handle_platform_message_response_method = nullptr;
@@ -68,7 +68,7 @@ void FlutterViewHandlePlatformMessageResponse(JNIEnv* env,
                                               jobject response) {
   env->CallVoidMethod(obj, g_handle_platform_message_response_method,
                       responseId, response);
-  FXL_CHECK(CheckException(env));
+  FML_CHECK(CheckException(env));
 }
 
 static jmethodID g_update_semantics_method = nullptr;
@@ -77,7 +77,7 @@ void FlutterViewUpdateSemantics(JNIEnv* env,
                                 jobject buffer,
                                 jobjectArray strings) {
   env->CallVoidMethod(obj, g_update_semantics_method, buffer, strings);
-  FXL_CHECK(CheckException(env));
+  FML_CHECK(CheckException(env));
 }
 
 static jmethodID g_update_custom_accessibility_actions_method = nullptr;
@@ -87,25 +87,25 @@ void FlutterViewUpdateCustomAccessibilityActions(JNIEnv* env,
                                                  jobjectArray strings) {
   env->CallVoidMethod(obj, g_update_custom_accessibility_actions_method, buffer,
                       strings);
-  FXL_CHECK(CheckException(env));
+  FML_CHECK(CheckException(env));
 }
 
 static jmethodID g_on_first_frame_method = nullptr;
 void FlutterViewOnFirstFrame(JNIEnv* env, jobject obj) {
   env->CallVoidMethod(obj, g_on_first_frame_method);
-  FXL_CHECK(CheckException(env));
+  FML_CHECK(CheckException(env));
 }
 
 static jmethodID g_attach_to_gl_context_method = nullptr;
 void SurfaceTextureAttachToGLContext(JNIEnv* env, jobject obj, jint textureId) {
   env->CallVoidMethod(obj, g_attach_to_gl_context_method, textureId);
-  FXL_CHECK(CheckException(env));
+  FML_CHECK(CheckException(env));
 }
 
 static jmethodID g_update_tex_image_method = nullptr;
 void SurfaceTextureUpdateTexImage(JNIEnv* env, jobject obj) {
   env->CallVoidMethod(obj, g_update_tex_image_method);
-  FXL_CHECK(CheckException(env));
+  FML_CHECK(CheckException(env));
 }
 
 static jmethodID g_get_transform_matrix_method = nullptr;
@@ -113,13 +113,13 @@ void SurfaceTextureGetTransformMatrix(JNIEnv* env,
                                       jobject obj,
                                       jfloatArray result) {
   env->CallVoidMethod(obj, g_get_transform_matrix_method, result);
-  FXL_CHECK(CheckException(env));
+  FML_CHECK(CheckException(env));
 }
 
 static jmethodID g_detach_from_gl_context_method = nullptr;
 void SurfaceTextureDetachFromGLContext(JNIEnv* env, jobject obj) {
   env->CallVoidMethod(obj, g_detach_from_gl_context_method);
-  FXL_CHECK(CheckException(env));
+  FML_CHECK(CheckException(env));
 }
 
 // Called By Java
@@ -157,7 +157,7 @@ static void SurfaceCreated(JNIEnv* env,
   // ANativeWindow_fromSurface are released immediately. This is needed as a
   // workaround for https://code.google.com/p/android/issues/detail?id=68174
   fml::jni::ScopedJavaLocalFrame scoped_local_reference_frame(env);
-  auto window = fxl::MakeRefCounted<AndroidNativeWindow>(
+  auto window = fml::MakeRefCounted<AndroidNativeWindow>(
       ANativeWindow_fromSurface(env, jsurface));
   ANDROID_SHELL_HOLDER->GetPlatformView()->NotifyCreated(std::move(window));
 }
@@ -259,7 +259,7 @@ static void RunBundleAndSnapshot(
 
   auto isolate_configuration = CreateIsolateConfiguration(*asset_manager);
   if (!isolate_configuration) {
-    FXL_DLOG(ERROR)
+    FML_DLOG(ERROR)
         << "Isolate configuration could not be determined for engine launch.";
     return;
   }
diff --git a/shell/platform/android/platform_view_android_jni.h b/shell/platform/android/platform_view_android_jni.h
index 1a03d1303a7ec939f4947ef91ba63b5a4dd2f71e..4927e35cc981b38b47959292b0ee8fb89bb4bb6b 100644
--- a/shell/platform/android/platform_view_android_jni.h
+++ b/shell/platform/android/platform_view_android_jni.h
@@ -6,8 +6,8 @@
 #define FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_JNI_H_
 
 #include <jni.h>
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/android/platform_view_android.h"
-#include "lib/fxl/macros.h"
 
 namespace shell {
 
diff --git a/shell/platform/android/vsync_waiter_android.cc b/shell/platform/android/vsync_waiter_android.cc
index 51c2f461bc3ad606c652409c2dc8f70cc003f12a..be04abcf1e61f3cdb822d304f30229afcdf6b870 100644
--- a/shell/platform/android/vsync_waiter_android.cc
+++ b/shell/platform/android/vsync_waiter_android.cc
@@ -8,17 +8,17 @@
 #include <utility>
 
 #include "flutter/common/task_runners.h"
+#include "flutter/fml/arraysize.h"
+#include "flutter/fml/logging.h"
 #include "flutter/fml/platform/android/jni_util.h"
 #include "flutter/fml/platform/android/scoped_java_ref.h"
 #include "flutter/fml/trace_event.h"
-#include "lib/fxl/arraysize.h"
-#include "lib/fxl/logging.h"
 
 namespace shell {
 
 static void ConsumePendingCallback(jlong java_baton,
-                                   fxl::TimePoint frame_start_time,
-                                   fxl::TimePoint frame_target_time);
+                                   fml::TimePoint frame_start_time,
+                                   fml::TimePoint frame_target_time);
 
 static fml::jni::ScopedJavaGlobalRef<jclass>* g_vsync_waiter_class = nullptr;
 static jmethodID g_async_wait_for_vsync_method_ = nullptr;
@@ -48,10 +48,10 @@ static void OnNativeVsync(JNIEnv* env,
                           jlong frameTimeNanos,
                           jlong frameTargetTimeNanos,
                           jlong java_baton) {
-  auto frame_time = fxl::TimePoint::FromEpochDelta(
-      fxl::TimeDelta::FromNanoseconds(frameTimeNanos));
-  auto target_time = fxl::TimePoint::FromEpochDelta(
-      fxl::TimeDelta::FromNanoseconds(frameTargetTimeNanos));
+  auto frame_time = fml::TimePoint::FromEpochDelta(
+      fml::TimeDelta::FromNanoseconds(frameTimeNanos));
+  auto target_time = fml::TimePoint::FromEpochDelta(
+      fml::TimeDelta::FromNanoseconds(frameTargetTimeNanos));
 
   ConsumePendingCallback(java_baton, frame_time, target_time);
 }
@@ -71,19 +71,19 @@ bool VsyncWaiterAndroid::Register(JNIEnv* env) {
 
   g_vsync_waiter_class = new fml::jni::ScopedJavaGlobalRef<jclass>(env, clazz);
 
-  FXL_CHECK(!g_vsync_waiter_class->is_null());
+  FML_CHECK(!g_vsync_waiter_class->is_null());
 
   g_async_wait_for_vsync_method_ = env->GetStaticMethodID(
       g_vsync_waiter_class->obj(), "asyncWaitForVsync", "(J)V");
 
-  FXL_CHECK(g_async_wait_for_vsync_method_ != nullptr);
+  FML_CHECK(g_async_wait_for_vsync_method_ != nullptr);
 
   return env->RegisterNatives(clazz, methods, arraysize(methods)) == 0;
 }
 
 static void ConsumePendingCallback(jlong java_baton,
-                                   fxl::TimePoint frame_start_time,
-                                   fxl::TimePoint frame_target_time) {
+                                   fml::TimePoint frame_start_time,
+                                   fml::TimePoint frame_target_time) {
   auto weak_this = reinterpret_cast<std::weak_ptr<VsyncWaiter>*>(java_baton);
   auto shared_this = weak_this->lock();
   delete weak_this;
diff --git a/shell/platform/android/vsync_waiter_android.h b/shell/platform/android/vsync_waiter_android.h
index 857bce3e2c123fe43f8e4a3f23c164d1f30908f5..6c664059ded28db924704493ef3a1586b651618e 100644
--- a/shell/platform/android/vsync_waiter_android.h
+++ b/shell/platform/android/vsync_waiter_android.h
@@ -7,9 +7,9 @@
 
 #include <jni.h>
 #include <memory>
+#include "flutter/fml/macros.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/shell/common/vsync_waiter.h"
-#include "lib/fxl/macros.h"
 
 namespace shell {
 
@@ -25,7 +25,7 @@ class VsyncWaiterAndroid final : public VsyncWaiter {
   // |shell::VsyncWaiter|
   void AwaitVSync() override;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(VsyncWaiterAndroid);
+  FML_DISALLOW_COPY_AND_ASSIGN(VsyncWaiterAndroid);
 };
 
 }  // namespace shell
diff --git a/shell/platform/darwin/BUILD.gn b/shell/platform/darwin/BUILD.gn
index 2e3798ec016ab1b3e38b50200251bbd7878cb1f3..e608a9dd6af48baa61dd4c59e28d4fdeec619b86 100644
--- a/shell/platform/darwin/BUILD.gn
+++ b/shell/platform/darwin/BUILD.gn
@@ -41,7 +41,6 @@ source_set("flutter_channels") {
     "$flutter_root/fml",
     "$flutter_root/runtime",
     "$flutter_root/shell/common",
-    "//garnet/public/lib/fxl",
     "//third_party/skia",
   ]
 
diff --git a/shell/platform/darwin/common/BUILD.gn b/shell/platform/darwin/common/BUILD.gn
index beef771ab3add1d533d0f1516ab8102388d9d769..38df59c502d75e9add31b682c486f5b9342cbf1b 100644
--- a/shell/platform/darwin/common/BUILD.gn
+++ b/shell/platform/darwin/common/BUILD.gn
@@ -20,7 +20,6 @@ source_set("common") {
     "$flutter_root/fml",
     "$flutter_root/runtime",
     "$flutter_root/shell/common",
-    "//garnet/public/lib/fxl",
     "//third_party/dart/runtime:dart_api",
     "//third_party/skia",
   ]
diff --git a/shell/platform/darwin/common/command_line.h b/shell/platform/darwin/common/command_line.h
index dfc995b90f3789745e3166c4ac79fb3887d8a075..63add3f4285a060694cd12e5e16224b5ca48a36e 100644
--- a/shell/platform/darwin/common/command_line.h
+++ b/shell/platform/darwin/common/command_line.h
@@ -5,12 +5,12 @@
 #ifndef FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_COMMAND_LINE_H_
 #define FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_COMMAND_LINE_H_
 
-#include "lib/fxl/command_line.h"
-#include "lib/fxl/macros.h"
+#include "flutter/fml/command_line.h"
+#include "flutter/fml/macros.h"
 
 namespace shell {
 
-fxl::CommandLine CommandLineFromNSProcessInfo();
+fml::CommandLine CommandLineFromNSProcessInfo();
 
 }  // namespace shell
 
diff --git a/shell/platform/darwin/common/command_line.mm b/shell/platform/darwin/common/command_line.mm
index bf8d4cc9d40f4fb403a1e00f2f9ff4d74eed2e7c..18e37f2b4f798123639b1004991ef90f69732de7 100644
--- a/shell/platform/darwin/common/command_line.mm
+++ b/shell/platform/darwin/common/command_line.mm
@@ -8,14 +8,14 @@
 
 namespace shell {
 
-fxl::CommandLine CommandLineFromNSProcessInfo() {
+fml::CommandLine CommandLineFromNSProcessInfo() {
   std::vector<std::string> args_vector;
 
   for (NSString* arg in [NSProcessInfo processInfo].arguments) {
     args_vector.emplace_back(arg.UTF8String);
   }
 
-  return fxl::CommandLineFromIterators(args_vector.begin(), args_vector.end());
+  return fml::CommandLineFromIterators(args_vector.begin(), args_vector.end());
 }
 
 }  // namespace shell
diff --git a/shell/platform/darwin/desktop/BUILD.gn b/shell/platform/darwin/desktop/BUILD.gn
index b66ddc1dbc4874b11711b3b396b4772d84f645ca..619c7ad82708448907cb864a1fbc6b8223f9caa6 100644
--- a/shell/platform/darwin/desktop/BUILD.gn
+++ b/shell/platform/darwin/desktop/BUILD.gn
@@ -35,7 +35,6 @@ source_set("mac_desktop_platform") {
     "$flutter_root/shell/common",
     "$flutter_root/shell/platform/darwin/common",
     "$flutter_root/synchronization",
-    "//garnet/public/lib/fxl",
     "//third_party/dart/runtime:libdart_jit",
     "//third_party/skia",
     "//third_party/skia:gpu",
diff --git a/shell/platform/darwin/desktop/flutter_window.mm b/shell/platform/darwin/desktop/flutter_window.mm
index d6e19dec130c0be27a66527088dcc7a9e0537545..28591b950dc7f3ae947bb69944373731b5b63a56 100644
--- a/shell/platform/darwin/desktop/flutter_window.mm
+++ b/shell/platform/darwin/desktop/flutter_window.mm
@@ -9,6 +9,7 @@
 #include <sstream>
 
 #include "flutter/common/task_runners.h"
+#include "flutter/fml/make_copyable.h"
 #include "flutter/fml/message_loop.h"
 #include "flutter/shell/common/rasterizer.h"
 #include "flutter/shell/common/switches.h"
@@ -16,7 +17,6 @@
 #include "flutter/shell/gpu/gpu_surface_gl.h"
 #include "flutter/shell/platform/darwin/common/command_line.h"
 #include "flutter/shell/platform/darwin/desktop/platform_view_mac.h"
-#include "lib/fxl/functional/make_copyable.h"
 
 @interface FlutterWindow () <NSWindowDelegate>
 
@@ -90,7 +90,7 @@ static std::string CreateThreadLabel() {
 }
 
 - (void)setupShell {
-  FXL_DCHECK(!_shell) << "The shell must not already be set.";
+  FML_DCHECK(!_shell) << "The shell must not already be set.";
 
   auto thread_label = CreateThreadLabel();
 
@@ -115,7 +115,7 @@ static std::string CreateThreadLabel() {
         [[NSBundle mainBundle] pathForResource:@"icudtl.dat" ofType:@""].UTF8String;
   }
 
-  settings.task_observer_add = [](intptr_t key, fxl::Closure callback) {
+  settings.task_observer_add = [](intptr_t key, fml::closure callback) {
     fml::MessageLoop::GetCurrent().AddTaskObserver(key, std::move(callback));
   };
 
@@ -138,13 +138,13 @@ static std::string CreateThreadLabel() {
                                 on_create_rasterizer);
 
   // Launch the engine with the inferred run configuration.
-  _shell->GetTaskRunners().GetUITaskRunner()->PostTask(fxl::MakeCopyable(
+  _shell->GetTaskRunners().GetUITaskRunner()->PostTask(fml::MakeCopyable(
       [engine = _shell->GetEngine(),
        config = shell::RunConfiguration::InferFromSettings(_shell->GetSettings())]() mutable {
         if (engine) {
           auto result = engine->Run(std::move(config));
           if (!result) {
-            FXL_LOG(ERROR) << "Could not launch the engine with configuration.";
+            FML_LOG(ERROR) << "Could not launch the engine with configuration.";
           }
         }
       }));
@@ -227,7 +227,7 @@ static std::string CreateThreadLabel() {
     case blink::PointerData::Change::kAdd:
     case blink::PointerData::Change::kRemove:
     case blink::PointerData::Change::kHover:
-      FXL_DCHECK(!_mouseIsDown);
+      FML_DCHECK(!_mouseIsDown);
       break;
   }
 
diff --git a/shell/platform/darwin/desktop/main_mac.mm b/shell/platform/darwin/desktop/main_mac.mm
index edd08d0c8b7838396d2dae63d6a2ed7c64819967..55a8e6a6de042296dc41817ab1a523f7f3f4e272 100644
--- a/shell/platform/darwin/desktop/main_mac.mm
+++ b/shell/platform/darwin/desktop/main_mac.mm
@@ -6,12 +6,12 @@
 
 #include <iostream>
 
+#include "flutter/fml/command_line.h"
+#include "flutter/fml/logging.h"
 #include "flutter/fml/message_loop.h"
 #include "flutter/shell/common/shell.h"
 #include "flutter/shell/common/switches.h"
 #include "flutter/shell/platform/darwin/desktop/flutter_application_delegate.h"
-#include "lib/fxl/command_line.h"
-#include "lib/fxl/logging.h"
 
 int main(int argc, const char* argv[]) {
   std::vector<std::string> args_vector;
@@ -20,7 +20,7 @@ int main(int argc, const char* argv[]) {
     args_vector.emplace_back(arg.UTF8String);
   }
 
-  auto command_line = fxl::CommandLineFromIterators(args_vector.begin(), args_vector.end());
+  auto command_line = fml::CommandLineFromIterators(args_vector.begin(), args_vector.end());
 
   // Print help.
   if (command_line.HasOption(shell::FlagForSwitch(shell::Switch::Help))) {
diff --git a/shell/platform/darwin/desktop/platform_view_mac.h b/shell/platform/darwin/desktop/platform_view_mac.h
index d4b19b94d1d99ee33cd9dce66b70b63f39326968..c288d324ab0ab891dfeda0ba1fd5f618ad3acce1 100644
--- a/shell/platform/darwin/desktop/platform_view_mac.h
+++ b/shell/platform/darwin/desktop/platform_view_mac.h
@@ -5,11 +5,11 @@
 #ifndef SHELL_PLATFORM_MAC_PLATFORM_VIEW_MAC_H_
 #define SHELL_PLATFORM_MAC_PLATFORM_VIEW_MAC_H_
 
+#include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/common/platform_view.h"
 #include "flutter/shell/common/shell.h"
 #include "flutter/shell/gpu/gpu_surface_gl.h"
-#include "lib/fxl/memory/weak_ptr.h"
 
 @class NSOpenGLView;
 @class NSOpenGLContext;
@@ -44,7 +44,7 @@ class PlatformViewMac final : public PlatformView, public GPUSurfaceGLDelegate {
   // |shell::PlatformView|
   sk_sp<GrContext> CreateResourceContext() const override;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(PlatformViewMac);
+  FML_DISALLOW_COPY_AND_ASSIGN(PlatformViewMac);
 };
 
 }  // namespace shell
diff --git a/shell/platform/darwin/desktop/platform_view_mac.mm b/shell/platform/darwin/desktop/platform_view_mac.mm
index d3657dea2616a117a31fc179562c584c90fc7639..2a08de681f96d9ac6d1adf2d18c6b4ad1b1a3612 100644
--- a/shell/platform/darwin/desktop/platform_view_mac.mm
+++ b/shell/platform/darwin/desktop/platform_view_mac.mm
@@ -7,13 +7,13 @@
 #include <AppKit/AppKit.h>
 #include <Foundation/Foundation.h>
 
+#include "flutter/fml/command_line.h"
 #include "flutter/fml/synchronization/waitable_event.h"
 #include "flutter/fml/trace_event.h"
 #include "flutter/shell/common/io_manager.h"
 #include "flutter/shell/common/rasterizer.h"
 #include "flutter/shell/common/switches.h"
 #include "flutter/shell/platform/darwin/desktop/vsync_waiter_mac.h"
-#include "lib/fxl/command_line.h"
 
 namespace shell {
 
diff --git a/shell/platform/darwin/desktop/vsync_waiter_mac.cc b/shell/platform/darwin/desktop/vsync_waiter_mac.cc
index 0ccadaf42754d8d7f06b5d836778c59ea1fdabbd..27aff35fb311c465c0869911a586f28d5c06e4fa 100644
--- a/shell/platform/darwin/desktop/vsync_waiter_mac.cc
+++ b/shell/platform/darwin/desktop/vsync_waiter_mac.cc
@@ -6,7 +6,7 @@
 
 #include <CoreVideo/CoreVideo.h>
 
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 
 namespace shell {
 
@@ -40,10 +40,10 @@ void VsyncWaiterMac::OnDisplayLink(void* context) {
 }
 
 void VsyncWaiterMac::OnDisplayLink() {
-  fxl::TimePoint frame_start_time = fxl::TimePoint::Now();
-  fxl::TimePoint frame_target_time =
+  fml::TimePoint frame_start_time = fml::TimePoint::Now();
+  fml::TimePoint frame_target_time =
       frame_start_time +
-      fxl::TimeDelta::FromSecondsF(
+      fml::TimeDelta::FromSecondsF(
           CVDisplayLinkGetActualOutputVideoRefreshPeriod(link_));
 
   CVDisplayLinkStop(link_);
diff --git a/shell/platform/darwin/desktop/vsync_waiter_mac.h b/shell/platform/darwin/desktop/vsync_waiter_mac.h
index 0ad929a509ea318471b4a493b78ae9795cdb0a1f..1bc4176263ef49694a53f6d375ae3d0d57edd813 100644
--- a/shell/platform/darwin/desktop/vsync_waiter_mac.h
+++ b/shell/platform/darwin/desktop/vsync_waiter_mac.h
@@ -5,8 +5,8 @@
 #ifndef FLUTTER_SHELL_PLATFORM_DARWIN_DESKTOP_VSYNC_WAITER_MAC_H_
 #define FLUTTER_SHELL_PLATFORM_DARWIN_DESKTOP_VSYNC_WAITER_MAC_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/common/vsync_waiter.h"
-#include "lib/fxl/macros.h"
 
 namespace shell {
 
@@ -25,7 +25,7 @@ class VsyncWaiterMac final : public VsyncWaiter {
 
   void OnDisplayLink();
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(VsyncWaiterMac);
+  FML_DISALLOW_COPY_AND_ASSIGN(VsyncWaiterMac);
 };
 
 }  // namespace shell
diff --git a/shell/platform/darwin/ios/BUILD.gn b/shell/platform/darwin/ios/BUILD.gn
index 89c593f34ee1e35b1e2abda69e3d91f2c43cd455..8deef8d7e8bb5275adf54cf78e0d3b1747e25772 100644
--- a/shell/platform/darwin/ios/BUILD.gn
+++ b/shell/platform/darwin/ios/BUILD.gn
@@ -103,7 +103,6 @@ shared_library("create_flutter_framework_dylib") {
     "$flutter_root/runtime",
     "$flutter_root/shell/common",
     "$flutter_root/shell/platform/darwin/common",
-    "//garnet/public/lib/fxl",
     "//third_party/skia",
     "//third_party/skia:gpu",
   ]
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm b/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
index b1410547e71bd3534b4046a52ef6594a997b4fd8..43a50a0458ea0015bbf499eb5608535d05c0880e 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
@@ -25,7 +25,7 @@ static blink::Settings DefaultSettingsForProcess() {
   // Settings passed in explicitly via command line arguments take priority.
   auto settings = shell::SettingsFromCommandLine(command_line);
 
-  settings.task_observer_add = [](intptr_t key, fxl::Closure callback) {
+  settings.task_observer_add = [](intptr_t key, fml::closure callback) {
     fml::MessageLoop::GetCurrent().AddTaskObserver(key, std::move(callback));
   };
 
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterHeadlessDartRunner.mm b/shell/platform/darwin/ios/framework/Source/FlutterHeadlessDartRunner.mm
index 0a422e2f77b061d69ad33f739c29a7f5a119b232..ae96ea8121704e4c3a610df8e73f730182c5ba12 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterHeadlessDartRunner.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterHeadlessDartRunner.mm
@@ -10,6 +10,7 @@
 #include <memory>
 #include <sstream>
 
+#include "flutter/fml/make_copyable.h"
 #include "flutter/fml/message_loop.h"
 #include "flutter/shell/common/engine.h"
 #include "flutter/shell/common/rasterizer.h"
@@ -23,7 +24,6 @@
 #include "flutter/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h"
 #include "flutter/shell/platform/darwin/ios/headless_platform_view_ios.h"
 #include "flutter/shell/platform/darwin/ios/platform_view_ios.h"
-#include "lib/fxl/functional/make_copyable.h"
 
 static std::unique_ptr<shell::HeadlessPlatformViewIOS> CreateHeadlessPlatformView(
     shell::Shell& shell) {
@@ -51,7 +51,7 @@ static std::string CreateShellLabel() {
                           libraryUri:(NSString*)uri
                           completion:(FlutterHeadlessDartRunnerCallback)callback {
   if (_shell != nullptr || entrypoint.length == 0) {
-    FXL_LOG(ERROR) << "This headless dart runner was already used to run some code.";
+    FML_LOG(ERROR) << "This headless dart runner was already used to run some code.";
     return;
   }
 
@@ -88,7 +88,7 @@ static std::string CreateShellLabel() {
   );
 
   if (_shell == nullptr) {
-    FXL_LOG(ERROR) << "Could not start a shell for the headless dart runner with entrypoint: "
+    FML_LOG(ERROR) << "Could not start a shell for the headless dart runner with entrypoint: "
                    << entrypoint.UTF8String;
     return;
   }
@@ -101,14 +101,14 @@ static std::string CreateShellLabel() {
 
   // Override the default run configuration with the specified entrypoint.
   _shell->GetTaskRunners().GetUITaskRunner()->PostTask(
-      fxl::MakeCopyable([engine = _shell->GetEngine(), config = std::move(config),
+      fml::MakeCopyable([engine = _shell->GetEngine(), config = std::move(config),
                          callback = Block_copy(callback)]() mutable {
         BOOL success = NO;
-        FXL_LOG(INFO) << "Attempting to launch background engine configuration...";
+        FML_LOG(INFO) << "Attempting to launch background engine configuration...";
         if (!engine || !engine->Run(std::move(config))) {
-          FXL_LOG(ERROR) << "Could not launch engine with configuration.";
+          FML_LOG(ERROR) << "Could not launch engine with configuration.";
         } else {
-          FXL_LOG(INFO) << "Background Isolate successfully started and run.";
+          FML_LOG(INFO) << "Background Isolate successfully started and run.";
           success = YES;
         }
         if (callback != nil) {
@@ -132,16 +132,16 @@ static std::string CreateShellLabel() {
               message:(NSData*)message
           binaryReply:(FlutterBinaryReply)callback {
   NSAssert(channel, @"The channel must not be null");
-  fxl::RefPtr<shell::PlatformMessageResponseDarwin> response =
+  fml::RefPtr<shell::PlatformMessageResponseDarwin> response =
       (callback == nil) ? nullptr
-                        : fxl::MakeRefCounted<shell::PlatformMessageResponseDarwin>(
+                        : fml::MakeRefCounted<shell::PlatformMessageResponseDarwin>(
                               ^(NSData* reply) {
                                 callback(reply);
                               },
                               _shell->GetTaskRunners().GetPlatformTaskRunner());
-  fxl::RefPtr<blink::PlatformMessage> platformMessage =
-      (message == nil) ? fxl::MakeRefCounted<blink::PlatformMessage>(channel.UTF8String, response)
-                       : fxl::MakeRefCounted<blink::PlatformMessage>(
+  fml::RefPtr<blink::PlatformMessage> platformMessage =
+      (message == nil) ? fml::MakeRefCounted<blink::PlatformMessage>(channel.UTF8String, response)
+                       : fml::MakeRefCounted<blink::PlatformMessage>(
                              channel.UTF8String, shell::GetVectorFromNSData(message), response);
 
   _shell->GetPlatformView()->DispatchPlatformMessage(platformMessage);
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate.mm b/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate.mm
index 7e45480e44db27c6cd134769f55bcc92775f58af..81a05493b54a9e154801282b9aff3c40d5bcf2ee 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate.mm
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h"
+#include "flutter/fml/logging.h"
 #include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
-#include "lib/fxl/logging.h"
 
 @implementation FlutterPluginAppLifeCycleDelegate {
   UIBackgroundTaskIdentifier _debugBackgroundTask;
@@ -71,7 +71,7 @@ static BOOL isPowerOfTwo(NSUInteger x) {
   _debugBackgroundTask = [application
       beginBackgroundTaskWithName:@"Flutter debug task"
                 expirationHandler:^{
-                  FXL_LOG(WARNING)
+                  FML_LOG(WARNING)
                       << "\nThe OS has terminated the Flutter debug connection for being "
                          "inactive in the background for too long.\n\n"
                          "There are no errors with your Flutter application.\n\n"
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm b/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
index a266ad7ea0ac9d799646bc6aacdcc42994f30473..146213b78c4a04d0a3720b7ab75cd8112bd1ac7b 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
@@ -105,17 +105,17 @@
 }
 
 - (shell::Shell&)shell {
-  FXL_DCHECK(_shell);
+  FML_DCHECK(_shell);
   return *_shell;
 }
 
 - (fml::WeakPtr<shell::PlatformViewIOS>)iosPlatformView {
-  FXL_DCHECK(_shell);
+  FML_DCHECK(_shell);
   return _shell->GetPlatformView();
 }
 
 - (BOOL)setupShell {
-  FXL_DCHECK(_shell == nullptr);
+  FML_DCHECK(_shell == nullptr);
 
   static size_t shell_count = 1;
 
@@ -163,7 +163,7 @@
   );
 
   if (!_shell) {
-    FXL_LOG(ERROR) << "Could not setup a shell to run the Dart application.";
+    FML_LOG(ERROR) << "Could not setup a shell to run the Dart application.";
     return false;
   }
 
@@ -389,13 +389,13 @@
 
   // Launch the Dart application with the inferred run configuration.
   _shell->GetTaskRunners().GetUITaskRunner()->PostTask(
-      fxl::MakeCopyable([engine = _shell->GetEngine(),                   //
+      fml::MakeCopyable([engine = _shell->GetEngine(),                   //
                          config = [_dartProject.get() runConfiguration]  //
   ]() mutable {
         if (engine) {
           auto result = engine->Run(std::move(config));
           if (!result) {
-            FXL_LOG(ERROR) << "Could not launch engine with configuration.";
+            FML_LOG(ERROR) << "Could not launch engine with configuration.";
           }
         }
       }));
@@ -534,7 +534,7 @@ static inline blink::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* to
         break;
     }
 
-    FXL_DCHECK(device_id != 0);
+    FML_DCHECK(device_id != 0);
     CGPoint windowCoordinates = [touch locationInView:self.view];
 
     blink::PointerData pointer_data;
@@ -609,7 +609,7 @@ static inline blink::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* to
   }
 
   _shell->GetTaskRunners().GetUITaskRunner()->PostTask(
-      fxl::MakeCopyable([engine = _shell->GetEngine(), packet = std::move(packet)] {
+      fml::MakeCopyable([engine = _shell->GetEngine(), packet = std::move(packet)] {
         if (engine) {
           engine->DispatchPointerDataPacket(*packet);
         }
@@ -969,16 +969,16 @@ constexpr CGFloat kStandardStatusBarHeight = 20.0;
               message:(NSData*)message
           binaryReply:(FlutterBinaryReply)callback {
   NSAssert(channel, @"The channel must not be null");
-  fxl::RefPtr<shell::PlatformMessageResponseDarwin> response =
+  fml::RefPtr<shell::PlatformMessageResponseDarwin> response =
       (callback == nil) ? nullptr
-                        : fxl::MakeRefCounted<shell::PlatformMessageResponseDarwin>(
+                        : fml::MakeRefCounted<shell::PlatformMessageResponseDarwin>(
                               ^(NSData* reply) {
                                 callback(reply);
                               },
                               _shell->GetTaskRunners().GetPlatformTaskRunner());
-  fxl::RefPtr<blink::PlatformMessage> platformMessage =
-      (message == nil) ? fxl::MakeRefCounted<blink::PlatformMessage>(channel.UTF8String, response)
-                       : fxl::MakeRefCounted<blink::PlatformMessage>(
+  fml::RefPtr<blink::PlatformMessage> platformMessage =
+      (message == nil) ? fml::MakeRefCounted<blink::PlatformMessage>(channel.UTF8String, response)
+                       : fml::MakeRefCounted<blink::PlatformMessage>(
                              channel.UTF8String, shell::GetVectorFromNSData(message), response);
 
   _shell->GetPlatformView()->DispatchPlatformMessage(platformMessage);
diff --git a/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h b/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h
index 2ac895d575dc345d300e2c3f7afacfab4cf3dbb1..3c90a23af0851de897005cb5f69c43de8483c417 100644
--- a/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h
+++ b/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h
@@ -12,14 +12,14 @@
 
 #import <UIKit/UIKit.h>
 
+#include "flutter/fml/macros.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
-#include "flutter/lib/ui/semantics/semantics_node.h"
 #include "flutter/lib/ui/semantics/custom_accessibility_action.h"
+#include "flutter/lib/ui/semantics/semantics_node.h"
 #include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterChannels.h"
 #include "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h"
 #include "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h"
-#include "lib/fxl/macros.h"
 #include "third_party/skia/include/core/SkMatrix44.h"
 #include "third_party/skia/include/core/SkRect.h"
 
@@ -116,9 +116,12 @@ class AccessibilityBridge final {
   AccessibilityBridge(UIView* view, PlatformViewIOS* platform_view);
   ~AccessibilityBridge();
 
-  void UpdateSemantics(blink::SemanticsNodeUpdates nodes, blink::CustomAccessibilityActionUpdates actions);
+  void UpdateSemantics(blink::SemanticsNodeUpdates nodes,
+                       blink::CustomAccessibilityActionUpdates actions);
   void DispatchSemanticsAction(int32_t id, blink::SemanticsAction action);
-  void DispatchSemanticsAction(int32_t id, blink::SemanticsAction action, std::vector<uint8_t> args);
+  void DispatchSemanticsAction(int32_t id,
+                               blink::SemanticsAction action,
+                               std::vector<uint8_t> args);
 
   UIView<UITextInput>* textInputView();
 
@@ -142,7 +145,7 @@ class AccessibilityBridge final {
   std::unordered_map<int32_t, blink::CustomAccessibilityAction> actions_;
   std::vector<int32_t> previous_routes_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(AccessibilityBridge);
+  FML_DISALLOW_COPY_AND_ASSIGN(AccessibilityBridge);
 };
 
 }  // namespace shell
diff --git a/shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm b/shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm
index 8ef64177d46d001a7d8db72a2597118e48ee73e5..6b60bc6b3ba6879500ee3929064967677fd93cc3 100644
--- a/shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm
+++ b/shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm
@@ -10,8 +10,8 @@
 
 #import <UIKit/UIKit.h>
 
+#include "flutter/fml/logging.h"
 #include "flutter/shell/platform/darwin/ios/platform_view_ios.h"
-#include "lib/fxl/logging.h"
 
 namespace {
 
@@ -36,7 +36,7 @@ blink::SemanticsAction GetSemanticsActionForScrollDirection(
     case UIAccessibilityScrollDirectionDown:
       return blink::SemanticsAction::kScrollUp;
   }
-  FXL_DCHECK(false);  // Unreachable
+  FML_DCHECK(false);  // Unreachable
   return blink::SemanticsAction::kScrollUp;
 }
 
@@ -103,8 +103,8 @@ blink::SemanticsAction GetSemanticsActionForScrollDirection(
 #pragma mark - Designated initializers
 
 - (instancetype)initWithBridge:(fml::WeakPtr<shell::AccessibilityBridge>)bridge uid:(int32_t)uid {
-  FXL_DCHECK(bridge) << "bridge must be set";
-  FXL_DCHECK(uid >= kRootNodeId);
+  FML_DCHECK(bridge) << "bridge must be set";
+  FML_DCHECK(uid >= kRootNodeId);
   self = [super init];
 
   if (self) {
@@ -410,7 +410,7 @@ blink::SemanticsAction GetSemanticsActionForScrollDirection(
 
 - (instancetype)initWithSemanticsObject:(SemanticsObject*)semanticsObject
                                  bridge:(fml::WeakPtr<shell::AccessibilityBridge>)bridge {
-  FXL_DCHECK(semanticsObject != nil) << "semanticsObject must be set";
+  FML_DCHECK(semanticsObject != nil) << "semanticsObject must be set";
   self = [super init];
 
   if (self) {
diff --git a/shell/platform/darwin/ios/framework/Source/flutter_touch_mapper.h b/shell/platform/darwin/ios/framework/Source/flutter_touch_mapper.h
index 51fc4f3e5b324538172b0a1aa174bafa5f927e09..e88b35d4ed5ad0e2e3c2ce6be2716874fde475eb 100644
--- a/shell/platform/darwin/ios/framework/Source/flutter_touch_mapper.h
+++ b/shell/platform/darwin/ios/framework/Source/flutter_touch_mapper.h
@@ -7,7 +7,7 @@
 
 #include <UIKit/UIKit.h>
 
-#include "lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 
 #include <map>
 
@@ -32,7 +32,7 @@ class TouchMapper {
   BitSet free_spots_;
   std::map<UITouch*, int> touch_map_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(TouchMapper);
+  FML_DISALLOW_COPY_AND_ASSIGN(TouchMapper);
 };
 
 }  // namespace shell
diff --git a/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h b/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h
index 2d925e2836ecfef720e89233ea852fcd8e190188..dd6ec72d56db45434644e7f0015935a8c9c5fa07 100644
--- a/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h
+++ b/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h
@@ -7,12 +7,12 @@
 
 #include <Foundation/Foundation.h>
 
+#include "flutter/fml/macros.h"
+#include "flutter/fml/make_copyable.h"
 #include "flutter/fml/platform/darwin/scoped_block.h"
 #include "flutter/fml/task_runner.h"
 #include "flutter/lib/ui/window/platform_message_response.h"
 #include "flutter/shell/platform/darwin/common/buffer_conversions.h"
-#include "lib/fxl/functional/make_copyable.h"
-#include "lib/fxl/macros.h"
 
 typedef void (^PlatformMessageResponseCallback)(NSData*);
 
@@ -21,28 +21,28 @@ namespace shell {
 class PlatformMessageResponseDarwin : public blink::PlatformMessageResponse {
  public:
   void Complete(std::unique_ptr<fml::Mapping> data) override {
-    fxl::RefPtr<PlatformMessageResponseDarwin> self(this);
-    platform_task_runner_->PostTask(fxl::MakeCopyable([self, data = std::move(data)]() mutable {
+    fml::RefPtr<PlatformMessageResponseDarwin> self(this);
+    platform_task_runner_->PostTask(fml::MakeCopyable([self, data = std::move(data)]() mutable {
       self->callback_.get()(shell::GetNSDataFromMapping(std::move(data)));
     }));
   }
 
   void CompleteEmpty() override {
-    fxl::RefPtr<PlatformMessageResponseDarwin> self(this);
+    fml::RefPtr<PlatformMessageResponseDarwin> self(this);
     platform_task_runner_->PostTask(
-        fxl::MakeCopyable([self]() mutable { self->callback_.get()(nil); }));
+        fml::MakeCopyable([self]() mutable { self->callback_.get()(nil); }));
   }
 
  private:
   explicit PlatformMessageResponseDarwin(PlatformMessageResponseCallback callback,
-                                         fxl::RefPtr<fxl::TaskRunner> platform_task_runner)
+                                         fml::RefPtr<fml::TaskRunner> platform_task_runner)
       : callback_(callback, fml::OwnershipPolicy::Retain),
         platform_task_runner_(std::move(platform_task_runner)) {}
 
   fml::ScopedBlock<PlatformMessageResponseCallback> callback_;
-  fxl::RefPtr<fxl::TaskRunner> platform_task_runner_;
+  fml::RefPtr<fml::TaskRunner> platform_task_runner_;
 
-  FRIEND_MAKE_REF_COUNTED(PlatformMessageResponseDarwin);
+  FML_FRIEND_MAKE_REF_COUNTED(PlatformMessageResponseDarwin);
 };
 
 }  // namespace shell
diff --git a/shell/platform/darwin/ios/framework/Source/platform_message_router.h b/shell/platform/darwin/ios/framework/Source/platform_message_router.h
index d2488f82fe47c7ff89b383746863e32ffdb9d12d..4013dc947da0bd2ff0eb91ca68823991cb4fa17a 100644
--- a/shell/platform/darwin/ios/framework/Source/platform_message_router.h
+++ b/shell/platform/darwin/ios/framework/Source/platform_message_router.h
@@ -7,10 +7,10 @@
 
 #include <unordered_map>
 
+#include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/platform/darwin/scoped_block.h"
 #include "flutter/lib/ui/window/platform_message.h"
 #include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterBinaryMessenger.h"
-#include "lib/fxl/memory/weak_ptr.h"
 
 namespace shell {
 
@@ -19,7 +19,7 @@ class PlatformMessageRouter {
   PlatformMessageRouter();
   ~PlatformMessageRouter();
 
-  void HandlePlatformMessage(fxl::RefPtr<blink::PlatformMessage> message) const;
+  void HandlePlatformMessage(fml::RefPtr<blink::PlatformMessage> message) const;
 
   void SetMessageHandler(const std::string& channel,
                          FlutterBinaryMessageHandler handler);
@@ -28,7 +28,7 @@ class PlatformMessageRouter {
   std::unordered_map<std::string, fml::ScopedBlock<FlutterBinaryMessageHandler>>
       message_handlers_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(PlatformMessageRouter);
+  FML_DISALLOW_COPY_AND_ASSIGN(PlatformMessageRouter);
 };
 
 }  // namespace shell
diff --git a/shell/platform/darwin/ios/framework/Source/platform_message_router.mm b/shell/platform/darwin/ios/framework/Source/platform_message_router.mm
index 9beee4bb89688e6df0104d030899cc629e03ee99..0378539deefab843105288f79fc0f9962c5e3568 100644
--- a/shell/platform/darwin/ios/framework/Source/platform_message_router.mm
+++ b/shell/platform/darwin/ios/framework/Source/platform_message_router.mm
@@ -15,8 +15,8 @@ PlatformMessageRouter::PlatformMessageRouter() = default;
 PlatformMessageRouter::~PlatformMessageRouter() = default;
 
 void PlatformMessageRouter::HandlePlatformMessage(
-    fxl::RefPtr<blink::PlatformMessage> message) const {
-  fxl::RefPtr<blink::PlatformMessageResponse> completer = message->response();
+    fml::RefPtr<blink::PlatformMessage> message) const {
+  fml::RefPtr<blink::PlatformMessageResponse> completer = message->response();
   auto it = message_handlers_.find(message->channel());
   if (it != message_handlers_.end()) {
     FlutterBinaryMessageHandler handler = it->second;
diff --git a/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h b/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h
index 23aaf02510d6dfbc631802b1f987bbf42bec32d1..000f84a4a35b92017246a35e85a83e30e71ee974 100644
--- a/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h
+++ b/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h
@@ -5,10 +5,10 @@
 #ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_VSYNC_WAITER_IOS_H_
 #define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_VSYNC_WAITER_IOS_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/common/vsync_waiter.h"
-#include "lib/fxl/macros.h"
 
 @class VSyncClient;
 
@@ -26,7 +26,7 @@ class VsyncWaiterIOS final : public VsyncWaiter {
   // |shell::VsyncWaiter|
   void AwaitVSync() override;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(VsyncWaiterIOS);
+  FML_DISALLOW_COPY_AND_ASSIGN(VsyncWaiterIOS);
 };
 
 }  // namespace shell
diff --git a/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm b/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm
index 94fecda2532f8c248ff9449bba6e8c0b77be9058..6b80c12946b85a940dbf6d1e09edd80b0f57d296 100644
--- a/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm
+++ b/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm
@@ -11,12 +11,12 @@
 #include <mach/mach_time.h>
 
 #include "flutter/common/task_runners.h"
+#include "flutter/fml/logging.h"
 #include "flutter/fml/trace_event.h"
-#include "lib/fxl/logging.h"
 
 @interface VSyncClient : NSObject
 
-- (instancetype)initWithTaskRunner:(fxl::RefPtr<fxl::TaskRunner>)task_runner
+- (instancetype)initWithTaskRunner:(fml::RefPtr<fml::TaskRunner>)task_runner
                           callback:(shell::VsyncWaiter::Callback)callback;
 
 - (void)await;
@@ -52,7 +52,7 @@ void VsyncWaiterIOS::AwaitVSync() {
   fml::scoped_nsobject<CADisplayLink> display_link_;
 }
 
-- (instancetype)initWithTaskRunner:(fxl::RefPtr<fxl::TaskRunner>)task_runner
+- (instancetype)initWithTaskRunner:(fml::RefPtr<fml::TaskRunner>)task_runner
                           callback:(shell::VsyncWaiter::Callback)callback {
   self = [super init];
 
@@ -78,8 +78,8 @@ void VsyncWaiterIOS::AwaitVSync() {
 }
 
 - (void)onDisplayLink:(CADisplayLink*)link {
-  fxl::TimePoint frame_start_time = fxl::TimePoint::Now();
-  fxl::TimePoint frame_target_time = frame_start_time + fxl::TimeDelta::FromSecondsF(link.duration);
+  fml::TimePoint frame_start_time = fml::TimePoint::Now();
+  fml::TimePoint frame_target_time = frame_start_time + fml::TimeDelta::FromSecondsF(link.duration);
 
   display_link_.get().paused = YES;
 
diff --git a/shell/platform/darwin/ios/headless_platform_view_ios.h b/shell/platform/darwin/ios/headless_platform_view_ios.h
index 4b93080956cc02e6ca7b0cce2c485bd686a9e81c..6481b24cfbb8db2c996cd30b5c942fe19f4ce40c 100644
--- a/shell/platform/darwin/ios/headless_platform_view_ios.h
+++ b/shell/platform/darwin/ios/headless_platform_view_ios.h
@@ -7,12 +7,12 @@
 
 #include <memory>
 
+#include "flutter/fml/closure.h"
+#include "flutter/fml/macros.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/common/platform_view.h"
 #include "flutter/shell/platform/darwin/ios/framework/Source/platform_message_router.h"
-#include "lib/fxl/functional/closure.h"
-#include "lib/fxl/macros.h"
 
 namespace shell {
 
@@ -28,9 +28,9 @@ class HeadlessPlatformViewIOS : public PlatformView {
   PlatformMessageRouter platform_message_router_;
 
   // |shell::PlatformView|
-  void HandlePlatformMessage(fxl::RefPtr<blink::PlatformMessage> message);
+  void HandlePlatformMessage(fml::RefPtr<blink::PlatformMessage> message);
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(HeadlessPlatformViewIOS);
+  FML_DISALLOW_COPY_AND_ASSIGN(HeadlessPlatformViewIOS);
 };
 
 }  // namespace shell
diff --git a/shell/platform/darwin/ios/headless_platform_view_ios.mm b/shell/platform/darwin/ios/headless_platform_view_ios.mm
index 87ee75891a1e6a6882bc6b727152c68ccd62e9cf..d80c4d50a0e5f7d5a840cda2d9ba054eed1282a6 100644
--- a/shell/platform/darwin/ios/headless_platform_view_ios.mm
+++ b/shell/platform/darwin/ios/headless_platform_view_ios.mm
@@ -14,7 +14,7 @@ PlatformMessageRouter& HeadlessPlatformViewIOS::GetPlatformMessageRouter() {
 }
 
 // |shell::PlatformView|
-void HeadlessPlatformViewIOS::HandlePlatformMessage(fxl::RefPtr<blink::PlatformMessage> message) {
+void HeadlessPlatformViewIOS::HandlePlatformMessage(fml::RefPtr<blink::PlatformMessage> message) {
   platform_message_router_.HandlePlatformMessage(std::move(message));
 }
 }
\ No newline at end of file
diff --git a/shell/platform/darwin/ios/ios_external_texture_gl.h b/shell/platform/darwin/ios/ios_external_texture_gl.h
index baedf298bd61d768ec2b942044c032a967e56e18..929d10c7c9ba958710b7a105ee264f37b01217a8 100644
--- a/shell/platform/darwin/ios/ios_external_texture_gl.h
+++ b/shell/platform/darwin/ios/ios_external_texture_gl.h
@@ -31,7 +31,7 @@ class IOSExternalTextureGL : public flow::Texture {
   NSObject<FlutterTexture>* external_texture_;
   fml::CFRef<CVOpenGLESTextureCacheRef> cache_ref_;
   fml::CFRef<CVOpenGLESTextureRef> texture_ref_;
-  FXL_DISALLOW_COPY_AND_ASSIGN(IOSExternalTextureGL);
+  FML_DISALLOW_COPY_AND_ASSIGN(IOSExternalTextureGL);
 };
 
 }  // namespace shell
diff --git a/shell/platform/darwin/ios/ios_external_texture_gl.mm b/shell/platform/darwin/ios/ios_external_texture_gl.mm
index 0bd9a8ca3c7cb3dd3f9c1e6f77ffdec9df06446c..4802504b5f0d5e23baf392f447c0c5ff9136d93b 100644
--- a/shell/platform/darwin/ios/ios_external_texture_gl.mm
+++ b/shell/platform/darwin/ios/ios_external_texture_gl.mm
@@ -19,7 +19,7 @@ namespace shell {
 IOSExternalTextureGL::IOSExternalTextureGL(int64_t textureId,
                                            NSObject<FlutterTexture>* externalTexture)
     : Texture(textureId), external_texture_(externalTexture) {
-  FXL_DCHECK(external_texture_);
+  FML_DCHECK(external_texture_);
 }
 
 IOSExternalTextureGL::~IOSExternalTextureGL() = default;
@@ -32,7 +32,7 @@ void IOSExternalTextureGL::Paint(SkCanvas& canvas, const SkRect& bounds) {
     if (err == noErr) {
       cache_ref_.Reset(cache);
     } else {
-      FXL_LOG(WARNING) << "Failed to create GLES texture cache: " << err;
+      FML_LOG(WARNING) << "Failed to create GLES texture cache: " << err;
       return;
     }
   }
@@ -47,7 +47,7 @@ void IOSExternalTextureGL::Paint(SkCanvas& canvas, const SkRect& bounds) {
         &texture);
     texture_ref_.Reset(texture);
     if (err != noErr) {
-      FXL_LOG(WARNING) << "Could not create texture from pixel buffer: " << err;
+      FML_LOG(WARNING) << "Could not create texture from pixel buffer: " << err;
       return;
     }
   }
diff --git a/shell/platform/darwin/ios/ios_gl_context.h b/shell/platform/darwin/ios/ios_gl_context.h
index f42c1436461b1b0d75d0a80bd3eb0386bb6fa25f..e81954d58a0efdb2f18210e00b847978dc25ad40 100644
--- a/shell/platform/darwin/ios/ios_gl_context.h
+++ b/shell/platform/darwin/ios/ios_gl_context.h
@@ -10,9 +10,9 @@
 #import <OpenGLES/ES2/glext.h>
 #import <QuartzCore/CAEAGLLayer.h>
 
+#include "flutter/fml/macros.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/common/platform_view.h"
-#include "lib/fxl/macros.h"
 
 namespace shell {
 
@@ -47,7 +47,7 @@ class IOSGLContext {
   sk_sp<SkColorSpace> color_space_;
   bool valid_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(IOSGLContext);
+  FML_DISALLOW_COPY_AND_ASSIGN(IOSGLContext);
 };
 
 }  // namespace shell
diff --git a/shell/platform/darwin/ios/ios_gl_context.mm b/shell/platform/darwin/ios/ios_gl_context.mm
index 92647c5d54cf75a77288f7c790146e6b16673c6a..765e3c365058918478cafaf958e08a78b0515f38 100644
--- a/shell/platform/darwin/ios/ios_gl_context.mm
+++ b/shell/platform/darwin/ios/ios_gl_context.mm
@@ -29,34 +29,34 @@ IOSGLContext::IOSGLContext(fml::scoped_nsobject<CAEAGLLayer> layer)
                                                   sharegroup:context_.get().sharegroup]);
   }
 
-  FXL_DCHECK(layer_ != nullptr);
-  FXL_DCHECK(context_ != nullptr);
-  FXL_DCHECK(resource_context_ != nullptr);
+  FML_DCHECK(layer_ != nullptr);
+  FML_DCHECK(context_ != nullptr);
+  FML_DCHECK(resource_context_ != nullptr);
 
   bool context_current = [EAGLContext setCurrentContext:context_];
 
-  FXL_DCHECK(context_current);
-  FXL_DCHECK(glGetError() == GL_NO_ERROR);
+  FML_DCHECK(context_current);
+  FML_DCHECK(glGetError() == GL_NO_ERROR);
 
   // Generate the framebuffer
 
   glGenFramebuffers(1, &framebuffer_);
-  FXL_DCHECK(glGetError() == GL_NO_ERROR);
-  FXL_DCHECK(framebuffer_ != GL_NONE);
+  FML_DCHECK(glGetError() == GL_NO_ERROR);
+  FML_DCHECK(framebuffer_ != GL_NONE);
 
   glBindFramebuffer(GL_FRAMEBUFFER, framebuffer_);
-  FXL_DCHECK(glGetError() == GL_NO_ERROR);
+  FML_DCHECK(glGetError() == GL_NO_ERROR);
 
   // Setup color attachment
 
   glGenRenderbuffers(1, &colorbuffer_);
-  FXL_DCHECK(colorbuffer_ != GL_NONE);
+  FML_DCHECK(colorbuffer_ != GL_NONE);
 
   glBindRenderbuffer(GL_RENDERBUFFER, colorbuffer_);
-  FXL_DCHECK(glGetError() == GL_NO_ERROR);
+  FML_DCHECK(glGetError() == GL_NO_ERROR);
 
   glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, colorbuffer_);
-  FXL_DCHECK(glGetError() == GL_NO_ERROR);
+  FML_DCHECK(glGetError() == GL_NO_ERROR);
 
   // TODO:
   // iOS displays are more variable than just P3 or sRGB.  Reading the display
@@ -89,13 +89,13 @@ IOSGLContext::IOSGLContext(fml::scoped_nsobject<CAEAGLLayer> layer)
 }
 
 IOSGLContext::~IOSGLContext() {
-  FXL_DCHECK(glGetError() == GL_NO_ERROR);
+  FML_DCHECK(glGetError() == GL_NO_ERROR);
 
   // Deletes on GL_NONEs are ignored
   glDeleteFramebuffers(1, &framebuffer_);
   glDeleteRenderbuffers(1, &colorbuffer_);
 
-  FXL_DCHECK(glGetError() == GL_NO_ERROR);
+  FML_DCHECK(glGetError() == GL_NO_ERROR);
 }
 
 bool IOSGLContext::IsValid() const {
@@ -125,18 +125,18 @@ bool IOSGLContext::UpdateStorageSizeIfNecessary() {
     return true;
   }
   TRACE_EVENT_INSTANT0("flutter", "IOSGLContext::UpdateStorageSizeIfNecessary");
-  FXL_DLOG(INFO) << "Updating render buffer storage size.";
+  FML_DLOG(INFO) << "Updating render buffer storage size.";
 
   if (![EAGLContext setCurrentContext:context_]) {
     return false;
   }
 
-  FXL_DCHECK(glGetError() == GL_NO_ERROR);
+  FML_DCHECK(glGetError() == GL_NO_ERROR);
 
   glBindFramebuffer(GL_FRAMEBUFFER, framebuffer_);
 
   glBindRenderbuffer(GL_RENDERBUFFER, colorbuffer_);
-  FXL_DCHECK(glGetError() == GL_NO_ERROR);
+  FML_DCHECK(glGetError() == GL_NO_ERROR);
 
   if (![context_.get() renderbufferStorage:GL_RENDERBUFFER fromDrawable:layer_.get()]) {
     return false;
@@ -144,12 +144,12 @@ bool IOSGLContext::UpdateStorageSizeIfNecessary() {
 
   // Fetch the dimensions of the color buffer whose backing was just updated.
   glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_WIDTH, &storage_size_width_);
-  FXL_DCHECK(glGetError() == GL_NO_ERROR);
+  FML_DCHECK(glGetError() == GL_NO_ERROR);
 
   glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_HEIGHT, &storage_size_height_);
-  FXL_DCHECK(glGetError() == GL_NO_ERROR);
+  FML_DCHECK(glGetError() == GL_NO_ERROR);
 
-  FXL_DCHECK(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE);
+  FML_DCHECK(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE);
 
   return true;
 }
diff --git a/shell/platform/darwin/ios/ios_surface.h b/shell/platform/darwin/ios/ios_surface.h
index b629c2709e3d1d77d1473793bc325fd156ba10c6..8011905db4d6860b5b8c6a5fe74163426352330e 100644
--- a/shell/platform/darwin/ios/ios_surface.h
+++ b/shell/platform/darwin/ios/ios_surface.h
@@ -7,9 +7,9 @@
 
 #include <memory>
 
+#include "flutter/fml/macros.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/common/surface.h"
-#include "lib/fxl/macros.h"
 
 namespace shell {
 
@@ -28,7 +28,7 @@ class IOSSurface {
   virtual std::unique_ptr<Surface> CreateGPUSurface() = 0;
 
  public:
-  FXL_DISALLOW_COPY_AND_ASSIGN(IOSSurface);
+  FML_DISALLOW_COPY_AND_ASSIGN(IOSSurface);
 };
 
 }  // namespace shell
diff --git a/shell/platform/darwin/ios/ios_surface_gl.h b/shell/platform/darwin/ios/ios_surface_gl.h
index 7486d343eb0fd26f32feb004d8fb8957d7c9e4d3..1a3fc3ed3b4069fdddc4248906c1093668e08d8a 100644
--- a/shell/platform/darwin/ios/ios_surface_gl.h
+++ b/shell/platform/darwin/ios/ios_surface_gl.h
@@ -5,11 +5,11 @@
 #ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_SURFACE_GL_H_
 #define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_SURFACE_GL_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/gpu/gpu_surface_gl.h"
 #include "flutter/shell/platform/darwin/ios/ios_gl_context.h"
 #include "flutter/shell/platform/darwin/ios/ios_surface.h"
-#include "lib/fxl/macros.h"
 
 @class CAEAGLLayer;
 
@@ -42,7 +42,7 @@ class IOSSurfaceGL : public IOSSurface, public GPUSurfaceGLDelegate {
  private:
   IOSGLContext context_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(IOSSurfaceGL);
+  FML_DISALLOW_COPY_AND_ASSIGN(IOSSurfaceGL);
 };
 
 }  // namespace shell
diff --git a/shell/platform/darwin/ios/ios_surface_software.h b/shell/platform/darwin/ios/ios_surface_software.h
index e8fc332f06c8c36899af9a3b9cb7153165676429..ab2b483d1d236de97027969855077dc41fa8b309 100644
--- a/shell/platform/darwin/ios/ios_surface_software.h
+++ b/shell/platform/darwin/ios/ios_surface_software.h
@@ -5,10 +5,10 @@
 #ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_SURFACE_SOFTWARE_H_
 #define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_SURFACE_SOFTWARE_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/gpu/gpu_surface_software.h"
 #include "flutter/shell/platform/darwin/ios/ios_surface.h"
-#include "lib/fxl/macros.h"
 
 @class CALayer;
 
@@ -37,7 +37,7 @@ class IOSSurfaceSoftware final : public IOSSurface,
   fml::scoped_nsobject<CALayer> layer_;
   sk_sp<SkSurface> sk_surface_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(IOSSurfaceSoftware);
+  FML_DISALLOW_COPY_AND_ASSIGN(IOSSurfaceSoftware);
 };
 
 }  // namespace shell
diff --git a/shell/platform/darwin/ios/ios_surface_software.mm b/shell/platform/darwin/ios/ios_surface_software.mm
index b09a5d9a2d8a3fb346f000dd834071658476c03e..dba1fd7ce1fe90216934f1ed7429f0510791a210 100644
--- a/shell/platform/darwin/ios/ios_surface_software.mm
+++ b/shell/platform/darwin/ios/ios_surface_software.mm
@@ -8,9 +8,9 @@
 
 #include <memory>
 
+#include "flutter/fml/logging.h"
 #include "flutter/fml/platform/darwin/cf_utils.h"
 #include "flutter/fml/trace_event.h"
-#include "lib/fxl/logging.h"
 #include "third_party/skia/include/utils/mac/SkCGUtils.h"
 
 namespace shell {
diff --git a/shell/platform/darwin/ios/platform_view_ios.h b/shell/platform/darwin/ios/platform_view_ios.h
index ee6b076c3ba3e63ce0ea24001aa7962f1944d0e7..abe90c18cf7640faccb31c7d00d57425d2a2c30d 100644
--- a/shell/platform/darwin/ios/platform_view_ios.h
+++ b/shell/platform/darwin/ios/platform_view_ios.h
@@ -7,6 +7,8 @@
 
 #include <memory>
 
+#include "flutter/fml/closure.h"
+#include "flutter/fml/macros.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/common/platform_view.h"
@@ -16,8 +18,6 @@
 #include "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h"
 #include "flutter/shell/platform/darwin/ios/headless_platform_view_ios.h"
 #include "flutter/shell/platform/darwin/ios/ios_surface.h"
-#include "lib/fxl/functional/closure.h"
-#include "lib/fxl/macros.h"
 
 namespace shell {
 
@@ -46,7 +46,7 @@ class PlatformViewIOS final : public HeadlessPlatformViewIOS {
   PlatformMessageRouter platform_message_router_;
   std::unique_ptr<AccessibilityBridge> accessibility_bridge_;
   fml::scoped_nsprotocol<FlutterTextInputPlugin*> text_input_plugin_;
-  fxl::Closure firstFrameCallback_;
+  fml::closure firstFrameCallback_;
 
   // |shell::PlatformView|
   std::unique_ptr<Surface> CreateRenderingSurface() override;
@@ -68,7 +68,7 @@ class PlatformViewIOS final : public HeadlessPlatformViewIOS {
   // |shell::PlatformView|
   std::unique_ptr<VsyncWaiter> CreateVSyncWaiter() override;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(PlatformViewIOS);
+  FML_DISALLOW_COPY_AND_ASSIGN(PlatformViewIOS);
 };
 
 }  // namespace shell
diff --git a/shell/platform/darwin/ios/platform_view_ios.mm b/shell/platform/darwin/ios/platform_view_ios.mm
index 04d664dfc62df7be30bdd0fb03bdcbad5ec4dc59..4ab1419cb7be797e0d79caff9f8b5c1fb4637a29 100644
--- a/shell/platform/darwin/ios/platform_view_ios.mm
+++ b/shell/platform/darwin/ios/platform_view_ios.mm
@@ -25,9 +25,9 @@ PlatformViewIOS::PlatformViewIOS(PlatformView::Delegate& delegate,
       owner_controller_(owner_controller),
       owner_view_(owner_view),
       ios_surface_(owner_view_.createSurface) {
-  FXL_DCHECK(ios_surface_ != nullptr);
-  FXL_DCHECK(owner_controller_ != nullptr);
-  FXL_DCHECK(owner_view_ != nullptr);
+  FML_DCHECK(ios_surface_ != nullptr);
+  FML_DCHECK(owner_controller_ != nullptr);
+  FML_DCHECK(owner_view_ != nullptr);
 }
 
 PlatformViewIOS::~PlatformViewIOS() = default;
@@ -49,7 +49,7 @@ std::unique_ptr<Surface> PlatformViewIOS::CreateRenderingSurface() {
 // |shell::PlatformView|
 sk_sp<GrContext> PlatformViewIOS::CreateResourceContext() const {
   if (!ios_surface_->ResourceContextMakeCurrent()) {
-    FXL_DLOG(INFO) << "Could not make resource context current on IO thread. Async texture uploads "
+    FML_DLOG(INFO) << "Could not make resource context current on IO thread. Async texture uploads "
                       "will be disabled.";
     return nullptr;
   }
diff --git a/shell/platform/embedder/BUILD.gn b/shell/platform/embedder/BUILD.gn
index 661facca6a2a859e02bc5af3e6d2e0fa22012773..a35c72332c54eeacc0e82667e72b40af8c2b8fbd 100644
--- a/shell/platform/embedder/BUILD.gn
+++ b/shell/platform/embedder/BUILD.gn
@@ -29,7 +29,6 @@ source_set("embedder") {
     "$flutter_root/fml",
     "$flutter_root/lib/snapshot",
     "$flutter_root/shell/common",
-    "//garnet/public/lib/fxl",
     "//third_party/dart/runtime:libdart_jit",
     "//third_party/dart/runtime/bin:embedded_dart_io",
     "//third_party/skia",
diff --git a/shell/platform/embedder/embedder.cc b/shell/platform/embedder/embedder.cc
index f14553471c7be17401b23eaa87a759e93f55fe20..d77ac0764b2a373500b7199a0952cc23681d747b 100644
--- a/shell/platform/embedder/embedder.cc
+++ b/shell/platform/embedder/embedder.cc
@@ -4,7 +4,7 @@
 
 #define FML_USED_ON_EMBEDDER
 
-#include "lib/fxl/build_config.h"
+#include "flutter/fml/build_config.h"
 
 #if OS_WIN
 #define FLUTTER_EXPORT __declspec(dllexport)
@@ -18,7 +18,9 @@
 
 #include "flutter/assets/directory_asset_bundle.h"
 #include "flutter/common/task_runners.h"
+#include "flutter/fml/command_line.h"
 #include "flutter/fml/file.h"
+#include "flutter/fml/make_copyable.h"
 #include "flutter/fml/message_loop.h"
 #include "flutter/fml/paths.h"
 #include "flutter/shell/common/rasterizer.h"
@@ -26,9 +28,6 @@
 #include "flutter/shell/platform/embedder/embedder.h"
 #include "flutter/shell/platform/embedder/embedder_engine.h"
 #include "flutter/shell/platform/embedder/platform_view_embedder.h"
-#include "lib/fxl/command_line.h"
-#include "lib/fxl/files/file.h"
-#include "lib/fxl/functional/make_copyable.h"
 
 #define SAFE_ACCESS(pointer, member, default_value)                      \
   ([=]() {                                                               \
@@ -58,7 +57,7 @@ bool IsRendererValid(const FlutterRendererConfig* config) {
 }
 
 struct _FlutterPlatformMessageResponseHandle {
-  fxl::RefPtr<blink::PlatformMessage> message;
+  fml::RefPtr<blink::PlatformMessage> message;
 };
 
 FlutterResult FlutterEngineRun(size_t version,
@@ -107,7 +106,7 @@ FlutterResult FlutterEngineRun(size_t version,
   if (SAFE_ACCESS(args, platform_message_callback, nullptr) != nullptr) {
     platform_message_response_callback =
         [ptr = args->platform_message_callback,
-         user_data](fxl::RefPtr<blink::PlatformMessage> message) {
+         user_data](fml::RefPtr<blink::PlatformMessage> message) {
           auto handle = new FlutterPlatformMessageResponseHandle();
           const FlutterPlatformMessage incoming_message = {
               sizeof(FlutterPlatformMessage),  // struct_size
@@ -134,10 +133,10 @@ FlutterResult FlutterEngineRun(size_t version,
     icu_data_path = SAFE_ACCESS(args, icu_data_path, nullptr);
   }
 
-  fxl::CommandLine command_line;
+  fml::CommandLine command_line;
   if (SAFE_ACCESS(args, command_line_argc, 0) != 0 &&
       SAFE_ACCESS(args, command_line_argv, nullptr) != nullptr) {
-    command_line = fxl::CommandLineFromArgcArgv(
+    command_line = fml::CommandLineFromArgcArgv(
         SAFE_ACCESS(args, command_line_argc, 0),
         SAFE_ACCESS(args, command_line_argv, nullptr));
   }
@@ -152,10 +151,10 @@ FlutterResult FlutterEngineRun(size_t version,
       fml::paths::JoinPaths({settings.assets_path, "platform.dill"});
   std::string application_kernel_path = fml::paths::JoinPaths(
       {settings.assets_path, kApplicationKernelSnapshotFileName});
-  if (files::IsFile(application_kernel_path)) {
+  if (fml::IsFile(application_kernel_path)) {
     // Run from a kernel snapshot.
     settings.platform_kernel_path = platform_kernel_path;
-    if (files::IsFile(platform_kernel_path)) {
+    if (fml::IsFile(platform_kernel_path)) {
       settings.application_kernel_asset = kApplicationKernelSnapshotFileName;
     }
   } else {
@@ -164,7 +163,7 @@ FlutterResult FlutterEngineRun(size_t version,
     settings.packages_file_path = args->packages_path;
   }
 
-  settings.task_observer_add = [](intptr_t key, fxl::Closure callback) {
+  settings.task_observer_add = [](intptr_t key, fml::closure callback) {
     fml::MessageLoop::GetCurrent().AddTaskObserver(key, std::move(callback));
   };
   settings.task_observer_remove = [](intptr_t key) {
@@ -333,7 +332,7 @@ FlutterResult FlutterEngineSendPlatformMessage(
     return kInvalidArguments;
   }
 
-  auto message = fxl::MakeRefCounted<blink::PlatformMessage>(
+  auto message = fml::MakeRefCounted<blink::PlatformMessage>(
       flutter_message->channel,
       std::vector<uint8_t>(
           flutter_message->message,
diff --git a/shell/platform/embedder/embedder_engine.cc b/shell/platform/embedder/embedder_engine.cc
index 7416441d7902e5cb1455e6dd09fc7537a6b0df3a..ed33aa84c2d5931f19fa28292f7753f114b3a3d1 100644
--- a/shell/platform/embedder/embedder_engine.cc
+++ b/shell/platform/embedder/embedder_engine.cc
@@ -4,7 +4,7 @@
 
 #include "flutter/shell/platform/embedder/embedder_engine.h"
 
-#include "lib/fxl/functional/make_copyable.h"
+#include "flutter/fml/make_copyable.h"
 
 #ifdef ERROR
 #undef ERROR
@@ -56,13 +56,13 @@ bool EmbedderEngine::Run(RunConfiguration run_configuration) {
   }
 
   shell_->GetTaskRunners().GetUITaskRunner()->PostTask(
-      fxl::MakeCopyable([engine = shell_->GetEngine(),          // engine
+      fml::MakeCopyable([engine = shell_->GetEngine(),          // engine
                          config = std::move(run_configuration)  // config
   ]() mutable {
         if (engine) {
           auto result = engine->Run(std::move(config));
           if (!result) {
-            FXL_LOG(ERROR) << "Could not launch the engine with configuration.";
+            FML_LOG(ERROR) << "Could not launch the engine with configuration.";
           }
         }
       }));
@@ -90,7 +90,7 @@ bool EmbedderEngine::DispatchPointerDataPacket(
     return false;
   }
 
-  shell_->GetTaskRunners().GetUITaskRunner()->PostTask(fxl::MakeCopyable(
+  shell_->GetTaskRunners().GetUITaskRunner()->PostTask(fml::MakeCopyable(
       [engine = shell_->GetEngine(), packet = std::move(packet)] {
         if (engine) {
           engine->DispatchPointerDataPacket(*packet);
@@ -101,7 +101,7 @@ bool EmbedderEngine::DispatchPointerDataPacket(
 }
 
 bool EmbedderEngine::SendPlatformMessage(
-    fxl::RefPtr<blink::PlatformMessage> message) {
+    fml::RefPtr<blink::PlatformMessage> message) {
   if (!IsValid() || !message) {
     return false;
   }
diff --git a/shell/platform/embedder/embedder_engine.h b/shell/platform/embedder/embedder_engine.h
index c01b86c2aac47531f8db7c6e2d3f59855e8ca8e5..cd21e701d5c012633025376bf564707211b019bb 100644
--- a/shell/platform/embedder/embedder_engine.h
+++ b/shell/platform/embedder/embedder_engine.h
@@ -7,10 +7,10 @@
 
 #include <memory>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/common/shell.h"
 #include "flutter/shell/common/thread_host.h"
 #include "flutter/shell/platform/embedder/embedder.h"
-#include "lib/fxl/macros.h"
 
 namespace shell {
 
@@ -18,7 +18,8 @@ namespace shell {
 // instance of the Flutter engine.
 class EmbedderEngine {
  public:
-  EmbedderEngine(ThreadHost thread_host, blink::TaskRunners task_runners,
+  EmbedderEngine(ThreadHost thread_host,
+                 blink::TaskRunners task_runners,
                  blink::Settings settings,
                  Shell::CreateCallback<PlatformView> on_create_platform_view,
                  Shell::CreateCallback<Rasterizer> on_create_rasterizer);
@@ -38,14 +39,14 @@ class EmbedderEngine {
   bool DispatchPointerDataPacket(
       std::unique_ptr<blink::PointerDataPacket> packet);
 
-  bool SendPlatformMessage(fxl::RefPtr<blink::PlatformMessage> message);
+  bool SendPlatformMessage(fml::RefPtr<blink::PlatformMessage> message);
 
  private:
   const ThreadHost thread_host_;
   std::unique_ptr<Shell> shell_;
   bool is_valid_ = false;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(EmbedderEngine);
+  FML_DISALLOW_COPY_AND_ASSIGN(EmbedderEngine);
 };
 
 }  // namespace shell
diff --git a/shell/platform/embedder/platform_view_embedder.cc b/shell/platform/embedder/platform_view_embedder.cc
index db1bea35c691e9197a70180c0bd9f3cb134f8a0a..51012f3460b1e4e558e158097a8922dd897f92ae 100644
--- a/shell/platform/embedder/platform_view_embedder.cc
+++ b/shell/platform/embedder/platform_view_embedder.cc
@@ -33,7 +33,7 @@ intptr_t PlatformViewEmbedder::GLContextFBO() const {
 }
 
 void PlatformViewEmbedder::HandlePlatformMessage(
-    fxl::RefPtr<blink::PlatformMessage> message) {
+    fml::RefPtr<blink::PlatformMessage> message) {
   if (!message) {
     return;
   }
diff --git a/shell/platform/embedder/platform_view_embedder.h b/shell/platform/embedder/platform_view_embedder.h
index a5b76dfaa07bac93460d4bfe90215f35a93dab26..ecc0b3d977887e6eb9a50993b12ace84b3bc95ae 100644
--- a/shell/platform/embedder/platform_view_embedder.h
+++ b/shell/platform/embedder/platform_view_embedder.h
@@ -5,10 +5,10 @@
 #ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_PLATFORM_VIEW_EMBEDDER_H_
 #define FLUTTER_SHELL_PLATFORM_EMBEDDER_PLATFORM_VIEW_EMBEDDER_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/common/platform_view.h"
 #include "flutter/shell/gpu/gpu_surface_gl.h"
 #include "flutter/shell/platform/embedder/embedder.h"
-#include "lib/fxl/macros.h"
 
 namespace shell {
 
@@ -16,7 +16,7 @@ class PlatformViewEmbedder final : public PlatformView,
                                    public GPUSurfaceGLDelegate {
  public:
   using PlatformMessageResponseCallback =
-      std::function<void(fxl::RefPtr<blink::PlatformMessage>)>;
+      std::function<void(fml::RefPtr<blink::PlatformMessage>)>;
   struct DispatchTable {
     std::function<bool(void)> gl_make_current_callback;   // required
     std::function<bool(void)> gl_clear_current_callback;  // required
@@ -47,7 +47,7 @@ class PlatformViewEmbedder final : public PlatformView,
 
   // |shell::PlatformView|
   void HandlePlatformMessage(
-      fxl::RefPtr<blink::PlatformMessage> message) override;
+      fml::RefPtr<blink::PlatformMessage> message) override;
 
  private:
   DispatchTable dispatch_table_;
@@ -58,7 +58,7 @@ class PlatformViewEmbedder final : public PlatformView,
   // |shell::PlatformView|
   sk_sp<GrContext> CreateResourceContext() const override;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(PlatformViewEmbedder);
+  FML_DISALLOW_COPY_AND_ASSIGN(PlatformViewEmbedder);
 };
 
 }  // namespace shell
diff --git a/shell/testing/BUILD.gn b/shell/testing/BUILD.gn
index 67d8f73d1d33a51d2bd759197f70fc5f70290c88..0519d414a25326cf31ec045cd4b5b0188db559a6 100644
--- a/shell/testing/BUILD.gn
+++ b/shell/testing/BUILD.gn
@@ -19,7 +19,6 @@ executable("testing") {
     "$flutter_root/fml",
     "$flutter_root/lib/snapshot",
     "$flutter_root/shell/common",
-    "//garnet/public/lib/fxl",
     "//third_party/dart/runtime:libdart_jit",
     "//third_party/dart/runtime/bin:embedded_dart_io",
     "//third_party/skia",
diff --git a/shell/testing/tester_main.cc b/shell/testing/tester_main.cc
index 9763bd8dd785439603bd69c4fc1f087578ac149f..26e52833daf7c0f9e3cd0ad368b97f4473102e24 100644
--- a/shell/testing/tester_main.cc
+++ b/shell/testing/tester_main.cc
@@ -9,6 +9,7 @@
 #include "flutter/assets/asset_manager.h"
 #include "flutter/assets/directory_asset_bundle.h"
 #include "flutter/fml/file.h"
+#include "flutter/fml/make_copyable.h"
 #include "flutter/fml/message_loop.h"
 #include "flutter/fml/paths.h"
 #include "flutter/fml/synchronization/waitable_event.h"
@@ -18,8 +19,6 @@
 #include "flutter/shell/common/shell.h"
 #include "flutter/shell/common/switches.h"
 #include "flutter/shell/common/thread_host.h"
-#include "lib/fxl/files/path.h"
-#include "lib/fxl/functional/make_copyable.h"
 #include "third_party/dart/runtime/bin/embedded_dart_io.h"
 
 #ifdef ERROR
@@ -33,7 +32,7 @@ namespace shell {
 class ScriptCompletionTaskObserver {
  public:
   ScriptCompletionTaskObserver(Shell& shell,
-                               fxl::RefPtr<fxl::TaskRunner> main_task_runner,
+                               fml::RefPtr<fml::TaskRunner> main_task_runner,
                                bool run_forever)
       : engine_(shell.GetEngine()),
         main_task_runner_(std::move(main_task_runner)),
@@ -82,12 +81,12 @@ class ScriptCompletionTaskObserver {
 
  private:
   fml::WeakPtr<Engine> engine_;
-  fxl::RefPtr<fxl::TaskRunner> main_task_runner_;
+  fml::RefPtr<fml::TaskRunner> main_task_runner_;
   bool run_forever_ = false;
   tonic::DartErrorHandleType last_error_ = tonic::kUnknownErrorType;
   bool has_terminated = false;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(ScriptCompletionTaskObserver);
+  FML_DISALLOW_COPY_AND_ASSIGN(ScriptCompletionTaskObserver);
 };
 
 static bool FileNameIsDill(const std::string& name) {
@@ -134,12 +133,12 @@ int RunTester(const blink::Settings& settings, bool run_forever) {
   );
 
   if (!shell || !shell->IsSetup()) {
-    FXL_LOG(ERROR) << "Could not setup the shell.";
+    FML_LOG(ERROR) << "Could not setup the shell.";
     return EXIT_FAILURE;
   }
 
   if (settings.main_dart_file_path.empty()) {
-    FXL_LOG(ERROR) << "Main dart file not specified.";
+    FML_LOG(ERROR) << "Main dart file not specified.";
     return EXIT_FAILURE;
   }
 
@@ -147,12 +146,13 @@ int RunTester(const blink::Settings& settings, bool run_forever) {
       FileNameIsDill(settings.main_dart_file_path)
           ? IsolateConfiguration::CreateForSnapshot(
                 std::make_unique<fml::FileMapping>(
-                    files::AbsolutePath(settings.main_dart_file_path), false))
+                    fml::paths::AbsolutePath(settings.main_dart_file_path),
+                    false))
           : IsolateConfiguration::CreateForSource(settings.main_dart_file_path,
                                                   settings.packages_file_path);
 
   if (!isolate_configuration) {
-    FXL_LOG(ERROR) << "Could create isolate configuration.";
+    FML_LOG(ERROR) << "Could create isolate configuration.";
     return EXIT_FAILURE;
   }
 
@@ -180,7 +180,7 @@ int RunTester(const blink::Settings& settings, bool run_forever) {
   fml::AutoResetWaitableEvent sync_run_latch;
   fml::TaskRunner::RunNowOrPostTask(
       shell->GetTaskRunners().GetUITaskRunner(),
-      fxl::MakeCopyable([&sync_run_latch, &completion_observer,
+      fml::MakeCopyable([&sync_run_latch, &completion_observer,
                          engine = shell->GetEngine(),
                          config = std::move(run_configuration),
                          &engine_did_run]() mutable {
@@ -197,7 +197,7 @@ int RunTester(const blink::Settings& settings, bool run_forever) {
           engine->SetViewportMetrics(metrics);
 
         } else {
-          FXL_DLOG(ERROR) << "Could not launch the engine with configuration.";
+          FML_DLOG(ERROR) << "Could not launch the engine with configuration.";
         }
         sync_run_latch.Signal();
       }));
@@ -233,7 +233,7 @@ int main(int argc, char* argv[]) {
   dart::bin::SetExecutableName(argv[0]);
   dart::bin::SetExecutableArguments(argc - 1, argv);
 
-  auto command_line = fxl::CommandLineFromArgcArgv(argc, argv);
+  auto command_line = fml::CommandLineFromArgcArgv(argc, argv);
 
   if (command_line.HasOption(shell::FlagForSwitch(shell::Switch::Help))) {
     shell::PrintUsage("flutter_tester");
@@ -248,7 +248,7 @@ int main(int argc, char* argv[]) {
   }
 
   if (settings.main_dart_file_path.size() == 0) {
-    FXL_LOG(ERROR) << "Main dart file path not specified.";
+    FML_LOG(ERROR) << "Main dart file path not specified.";
     return EXIT_FAILURE;
   }
 
@@ -260,7 +260,7 @@ int main(int argc, char* argv[]) {
   // The tools that read logs get confused if there is a log tag specified.
   settings.log_tag = "";
 
-  settings.task_observer_add = [](intptr_t key, fxl::Closure callback) {
+  settings.task_observer_add = [](intptr_t key, fml::closure callback) {
     fml::MessageLoop::GetCurrent().AddTaskObserver(key, std::move(callback));
   };
 
diff --git a/testing/BUILD.gn b/testing/BUILD.gn
index a65311bfaeb7cbdc5be448c7487d060960928d45..7d5b8be9ae018f11968f06b66b3f510b56d41ba6 100644
--- a/testing/BUILD.gn
+++ b/testing/BUILD.gn
@@ -15,7 +15,6 @@ source_set("testing") {
 
   public_deps = [
     "$flutter_root/fml",
-    "//garnet/public/lib/fxl",
     "//third_party/googletest:gtest",
   ]
 
diff --git a/testing/thread_test.cc b/testing/thread_test.cc
index 1306f37678fbefc2a95defdbe649a8a6c1a73b83..1f4c1462bf3870b89695da1115502180654c4a3d 100644
--- a/testing/thread_test.cc
+++ b/testing/thread_test.cc
@@ -22,11 +22,11 @@ void ThreadTest::TearDown() {
   current_task_runner_ = nullptr;
 }
 
-fxl::RefPtr<fml::TaskRunner> ThreadTest::GetCurrentTaskRunner() {
+fml::RefPtr<fml::TaskRunner> ThreadTest::GetCurrentTaskRunner() {
   return current_task_runner_;
 }
 
-fxl::RefPtr<fml::TaskRunner> ThreadTest::GetThreadTaskRunner() {
+fml::RefPtr<fml::TaskRunner> ThreadTest::GetThreadTaskRunner() {
   return thread_task_runner_;
 }
 
diff --git a/testing/thread_test.h b/testing/thread_test.h
index 511d09c978858b00b81a3164b5b2340da7ea62cb..131aa05273f54df6ee2b843f2e88c293104b4887 100644
--- a/testing/thread_test.h
+++ b/testing/thread_test.h
@@ -7,19 +7,19 @@
 
 #include <memory>
 
+#include "flutter/fml/macros.h"
 #include "flutter/fml/message_loop.h"
 #include "flutter/fml/task_runner.h"
 #include "flutter/fml/thread.h"
 #include "gtest/gtest.h"
-#include "lib/fxl/macros.h"
 
 namespace testing {
 
 class ThreadTest : public Test {
  public:
-  fxl::RefPtr<fml::TaskRunner> GetCurrentTaskRunner();
+  fml::RefPtr<fml::TaskRunner> GetCurrentTaskRunner();
 
-  fxl::RefPtr<fml::TaskRunner> GetThreadTaskRunner();
+  fml::RefPtr<fml::TaskRunner> GetThreadTaskRunner();
 
  protected:
   void SetUp() override;
@@ -28,8 +28,8 @@ class ThreadTest : public Test {
 
  private:
   std::unique_ptr<fml::Thread> thread_;
-  fxl::RefPtr<fml::TaskRunner> thread_task_runner_;
-  fxl::RefPtr<fml::TaskRunner> current_task_runner_;
+  fml::RefPtr<fml::TaskRunner> thread_task_runner_;
+  fml::RefPtr<fml::TaskRunner> current_task_runner_;
 };
 
 }  // namespace testing
diff --git a/third_party/txt/BUILD.gn b/third_party/txt/BUILD.gn
index 572697af4e386a97f4deb016fdd6e4bd4c5a7815..b31467af544d30390633888531080142f236d98c 100644
--- a/third_party/txt/BUILD.gn
+++ b/third_party/txt/BUILD.gn
@@ -103,7 +103,7 @@ source_set("txt") {
   public_configs = [ ":txt_config" ]
 
   public_deps = [
-    "//garnet/public/lib/fxl",
+    "$flutter_root/fml",
     "//third_party/harfbuzz",
     "//third_party/icu",
     "//third_party/skia",
@@ -138,7 +138,7 @@ source_set("txt_test_utils") {
 
   deps = [
     ":txt",
-    "//garnet/public/lib/fxl",
+    "$flutter_root/fml",
     "//third_party/skia",
   ]
 }
diff --git a/third_party/txt/benchmarks/paint_record_benchmarks.cc b/third_party/txt/benchmarks/paint_record_benchmarks.cc
index 732af3e96a44a60063da1f8a927ad138216357b4..29bbaa94b10bf056f602e96f3792da23500420b9 100644
--- a/third_party/txt/benchmarks/paint_record_benchmarks.cc
+++ b/third_party/txt/benchmarks/paint_record_benchmarks.cc
@@ -16,9 +16,9 @@
 
 #include "third_party/benchmark/include/benchmark/benchmark_api.h"
 
+#include "flutter/fml/command_line.h"
+#include "flutter/fml/logging.h"
 #include "flutter/third_party/txt/tests/txt_test_utils.h"
-#include "lib/fxl/command_line.h"
-#include "lib/fxl/logging.h"
 #include "txt/paint_record.h"
 #include "txt/text_style.h"
 
diff --git a/third_party/txt/benchmarks/paragraph_benchmarks.cc b/third_party/txt/benchmarks/paragraph_benchmarks.cc
index 04d21996feeb8631f80192feb3f1d45f7c7250f8..d3236847bfc413c8abfbca2557ae60cceb177044 100644
--- a/third_party/txt/benchmarks/paragraph_benchmarks.cc
+++ b/third_party/txt/benchmarks/paragraph_benchmarks.cc
@@ -17,9 +17,9 @@
 #include "third_party/benchmark/include/benchmark/benchmark_api.h"
 
 #include <minikin/Layout.h>
+#include "flutter/fml/command_line.h"
+#include "flutter/fml/logging.h"
 #include "flutter/third_party/txt/tests/txt_test_utils.h"
-#include "lib/fxl/command_line.h"
-#include "lib/fxl/logging.h"
 #include "minikin/LayoutUtils.h"
 #include "third_party/icu/source/common/unicode/unistr.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/third_party/txt/benchmarks/paragraph_builder_benchmarks.cc b/third_party/txt/benchmarks/paragraph_builder_benchmarks.cc
index 2004889ceeaa5c1e2ea67fbefb478e892df9ab1d..3d78d0b7ec2b5cb8f120996b6b5c6e775c377be7 100644
--- a/third_party/txt/benchmarks/paragraph_builder_benchmarks.cc
+++ b/third_party/txt/benchmarks/paragraph_builder_benchmarks.cc
@@ -16,8 +16,8 @@
 
 #include "third_party/benchmark/include/benchmark/benchmark_api.h"
 
+#include "flutter/fml/logging.h"
 #include "flutter/third_party/txt/tests/txt_test_utils.h"
-#include "lib/fxl/logging.h"
 #include "third_party/icu/source/common/unicode/unistr.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "txt/font_collection.h"
diff --git a/third_party/txt/benchmarks/styled_runs_benchmarks.cc b/third_party/txt/benchmarks/styled_runs_benchmarks.cc
index c3300ac79ab7dd7c1c815c920fa806b5d5aeb31b..8039e348ae2dccdd71e9f6fc603eeda2b744b223 100644
--- a/third_party/txt/benchmarks/styled_runs_benchmarks.cc
+++ b/third_party/txt/benchmarks/styled_runs_benchmarks.cc
@@ -16,9 +16,9 @@
 
 #include "third_party/benchmark/include/benchmark/benchmark_api.h"
 
+#include "flutter/fml/command_line.h"
+#include "flutter/fml/logging.h"
 #include "flutter/third_party/txt/tests/txt_test_utils.h"
-#include "lib/fxl/command_line.h"
-#include "lib/fxl/logging.h"
 #include "txt/styled_runs.h"
 #include "txt/text_style.h"
 
diff --git a/third_party/txt/benchmarks/txt_run_all_benchmarks.cc b/third_party/txt/benchmarks/txt_run_all_benchmarks.cc
index b5c0bbeadc75e3b54f7a3317463a77013ab3abac..b3e140ad5689c09ec90639de29c54dd40625d405 100644
--- a/third_party/txt/benchmarks/txt_run_all_benchmarks.cc
+++ b/third_party/txt/benchmarks/txt_run_all_benchmarks.cc
@@ -17,23 +17,23 @@
 #include "third_party/benchmark/include/benchmark/benchmark_api.h"
 
 #include "flutter/fml/icu_util.h"
+#include "flutter/fml/logging.h"
 #include "flutter/third_party/txt/tests/txt_test_utils.h"
-#include "lib/fxl/logging.h"
 
 // We will use a custom main to allow custom font directories for consistency.
 int main(int argc, char** argv) {
   ::benchmark::Initialize(&argc, argv);
-  fxl::CommandLine cmd = fxl::CommandLineFromArgcArgv(argc, argv);
+  fml::CommandLine cmd = fml::CommandLineFromArgcArgv(argc, argv);
   txt::SetCommandLine(cmd);
   std::string dir = txt::GetCommandLineForProcess().GetOptionValueWithDefault(
       "font-directory", "");
   txt::SetFontDir(dir);
   if (txt::GetFontDir().length() <= 0) {
-    FXL_LOG(ERROR) << "Font directory must be specified with "
+    FML_LOG(ERROR) << "Font directory must be specified with "
                       "--font-directory=\"<directory>\" to run this test.";
     return EXIT_FAILURE;
   }
-  FXL_DCHECK(txt::GetFontDir().length() > 0);
+  FML_DCHECK(txt::GetFontDir().length() > 0);
 
   fml::icu::InitializeICU("icudtl.dat");
 
diff --git a/third_party/txt/src/log/log.h b/third_party/txt/src/log/log.h
index 1eaa637a38772fbce688d8e23bd2a522ddd0d6ad..edc153a5625fd2eda8ee35e1d84235afa223d0ea 100644
--- a/third_party/txt/src/log/log.h
+++ b/third_party/txt/src/log/log.h
@@ -18,7 +18,7 @@
 
 #include <stdint.h>
 
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 
 #if defined(_WIN32)
 // Conflicts with macro on Windows.
@@ -27,28 +27,28 @@
 
 #ifndef LOG_ALWAYS_FATAL_IF
 #define LOG_ALWAYS_FATAL_IF(cond, ...) \
-  ((cond) ? (FXL_LOG(FATAL) << #cond) : (void)0)
+  ((cond) ? (FML_LOG(FATAL) << #cond) : (void)0)
 #endif
 
 #ifndef LOG_ALWAYS_FATAL
-#define LOG_ALWAYS_FATAL(...) FXL_LOG(FATAL)
+#define LOG_ALWAYS_FATAL(...) FML_LOG(FATAL)
 #endif
 
 #ifndef LOG_ASSERT
-#define LOG_ASSERT(cond, ...) FXL_CHECK(cond)
+#define LOG_ASSERT(cond, ...) FML_CHECK(cond)
 #define ALOG_ASSERT LOG_ASSERT
 #endif
 
 #ifndef ALOGD
-#define ALOGD(message, ...) FXL_DLOG(INFO) << (message)
+#define ALOGD(message, ...) FML_DLOG(INFO) << (message)
 #endif
 
 #ifndef ALOGW
-#define ALOGW(message, ...) FXL_LOG(WARNING) << (message)
+#define ALOGW(message, ...) FML_LOG(WARNING) << (message)
 #endif
 
 #ifndef ALOGE
-#define ALOGE(message, ...) FXL_LOG(ERROR) << (message)
+#define ALOGE(message, ...) FML_LOG(ERROR) << (message)
 #endif
 
 #define android_errorWriteLog(tag, subTag) \
diff --git a/third_party/txt/src/txt/asset_font_manager.cc b/third_party/txt/src/txt/asset_font_manager.cc
index c9edd2b241d59b8867d7c495cf9afb7447693272..36e85aefba3b9531876a1fea52366863a26fc80d 100644
--- a/third_party/txt/src/txt/asset_font_manager.cc
+++ b/third_party/txt/src/txt/asset_font_manager.cc
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 #include "third_party/skia/include/core/SkString.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 
@@ -27,7 +27,7 @@ namespace txt {
 AssetFontManager::AssetFontManager(
     std::unique_ptr<FontAssetProvider> font_provider)
     : font_provider_(std::move(font_provider)) {
-  FXL_DCHECK(font_provider_ != nullptr);
+  FML_DCHECK(font_provider_ != nullptr);
 }
 
 AssetFontManager::~AssetFontManager() = default;
@@ -41,7 +41,7 @@ void AssetFontManager::onGetFamilyName(int index, SkString* familyName) const {
 }
 
 SkFontStyleSet* AssetFontManager::onCreateStyleSet(int index) const {
-  FXL_DCHECK(false);
+  FML_DCHECK(false);
   return nullptr;
 }
 
@@ -72,40 +72,40 @@ SkTypeface* AssetFontManager::onMatchFamilyStyleCharacter(
 
 SkTypeface* AssetFontManager::onMatchFaceStyle(const SkTypeface*,
                                                const SkFontStyle&) const {
-  FXL_DCHECK(false);
+  FML_DCHECK(false);
   return nullptr;
 }
 
 sk_sp<SkTypeface> AssetFontManager::onMakeFromData(sk_sp<SkData>,
                                                    int ttcIndex) const {
-  FXL_DCHECK(false);
+  FML_DCHECK(false);
   return nullptr;
 }
 
 sk_sp<SkTypeface> AssetFontManager::onMakeFromStreamIndex(
     std::unique_ptr<SkStreamAsset>,
     int ttcIndex) const {
-  FXL_DCHECK(false);
+  FML_DCHECK(false);
   return nullptr;
 }
 
 sk_sp<SkTypeface> AssetFontManager::onMakeFromStreamArgs(
     std::unique_ptr<SkStreamAsset>,
     const SkFontArguments&) const {
-  FXL_DCHECK(false);
+  FML_DCHECK(false);
   return nullptr;
 }
 
 sk_sp<SkTypeface> AssetFontManager::onMakeFromFile(const char path[],
                                                    int ttcIndex) const {
-  FXL_DCHECK(false);
+  FML_DCHECK(false);
   return nullptr;
 }
 
 sk_sp<SkTypeface> AssetFontManager::onLegacyMakeTypeface(
     const char familyName[],
     SkFontStyle) const {
-  FXL_DCHECK(false);
+  FML_DCHECK(false);
   return nullptr;
 }
 
diff --git a/third_party/txt/src/txt/asset_font_manager.h b/third_party/txt/src/txt/asset_font_manager.h
index 6cfc3de65da509f628e53cc1e625f0b696bb1811..9beb7b25ed8664ecadfa2150fd2a0b5240d7d88f 100644
--- a/third_party/txt/src/txt/asset_font_manager.h
+++ b/third_party/txt/src/txt/asset_font_manager.h
@@ -18,7 +18,7 @@
 #define TXT_ASSET_FONT_MANAGER_H_
 
 #include <memory>
-#include "lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 #include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/core/SkStream.h"
 #include "txt/font_asset_provider.h"
@@ -81,7 +81,7 @@ class AssetFontManager : public SkFontMgr {
   sk_sp<SkTypeface> onLegacyMakeTypeface(const char familyName[],
                                          SkFontStyle) const override;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(AssetFontManager);
+  FML_DISALLOW_COPY_AND_ASSIGN(AssetFontManager);
 };
 
 }  // namespace txt
diff --git a/third_party/txt/src/txt/font_collection.cc b/third_party/txt/src/txt/font_collection.cc
index 0fee4c7f825f47a5b1552f75b267eadbaf8adf85..a54de304aa5640e2e6b347903a4654b27e58885c 100644
--- a/third_party/txt/src/txt/font_collection.cc
+++ b/third_party/txt/src/txt/font_collection.cc
@@ -23,8 +23,8 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
+#include "flutter/fml/logging.h"
 #include "font_skia.h"
-#include "lib/fxl/logging.h"
 #include "txt/platform.h"
 #include "txt/text_style.h"
 
diff --git a/third_party/txt/src/txt/font_collection.h b/third_party/txt/src/txt/font_collection.h
index 33cc7ff5b6b0f8a8ae9cbd3c0908bee506c06d3f..ae723eb20dcbc16bbc8d3d21e94da8e9e2c70310 100644
--- a/third_party/txt/src/txt/font_collection.h
+++ b/third_party/txt/src/txt/font_collection.h
@@ -21,10 +21,10 @@
 #include <set>
 #include <string>
 #include <unordered_map>
-#include "lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 #include "minikin/FontCollection.h"
 #include "minikin/FontFamily.h"
-#include "third_party/googletest/googletest/include/gtest/gtest_prod.h" // nogncheck
+#include "third_party/googletest/googletest/include/gtest/gtest_prod.h"  // nogncheck
 #include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "txt/asset_font_manager.h"
@@ -94,7 +94,7 @@ class FontCollection : public std::enable_shared_from_this<FontCollection> {
       const sk_sp<SkFontMgr>& manager,
       const std::string& family_name);
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(FontCollection);
+  FML_DISALLOW_COPY_AND_ASSIGN(FontCollection);
 };
 
 }  // namespace txt
diff --git a/third_party/txt/src/txt/font_skia.h b/third_party/txt/src/txt/font_skia.h
index 034a19906c755f7291326243e238653fd9bc098f..b595c1275179c156faa4d00b3ba2ba800444f61e 100644
--- a/third_party/txt/src/txt/font_skia.h
+++ b/third_party/txt/src/txt/font_skia.h
@@ -17,7 +17,7 @@
 #include <SkPaint.h>
 #include <SkTypeface.h>
 #include <minikin/MinikinFont.h>
-#include "lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 
 namespace txt {
 
@@ -44,7 +44,7 @@ class FontSkia : public minikin::MinikinFont {
   sk_sp<SkTypeface> typeface_;
   std::vector<minikin::FontVariation> variations_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(FontSkia);
+  FML_DISALLOW_COPY_AND_ASSIGN(FontSkia);
 };
 
 }  // namespace txt
diff --git a/third_party/txt/src/txt/paint_record.cc b/third_party/txt/src/txt/paint_record.cc
index 65e5bbc27f1f2adb06183ebcaab66304a4cbbbf4..f37429499ce71285385edd12c99359a55c96d19d 100644
--- a/third_party/txt/src/txt/paint_record.cc
+++ b/third_party/txt/src/txt/paint_record.cc
@@ -15,7 +15,7 @@
  */
 
 #include "paint_record.h"
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 
 namespace txt {
 
diff --git a/third_party/txt/src/txt/paint_record.h b/third_party/txt/src/txt/paint_record.h
index f0577fa74e02f6a48572b49eb91569199412588a..8fa52fa4560ea5b352e5a4043b44d0fad7132967 100644
--- a/third_party/txt/src/txt/paint_record.h
+++ b/third_party/txt/src/txt/paint_record.h
@@ -17,8 +17,8 @@
 #ifndef LIB_TXT_SRC_PAINT_RECORD_H_
 #define LIB_TXT_SRC_PAINT_RECORD_H_
 
-#include "lib/fxl/logging.h"
-#include "lib/fxl/macros.h"
+#include "flutter/fml/logging.h"
+#include "flutter/fml/macros.h"
 #include "text_style.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkTextBlob.h"
@@ -76,7 +76,7 @@ class PaintRecord {
   size_t line_;
   double run_width_ = 0.0f;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(PaintRecord);
+  FML_DISALLOW_COPY_AND_ASSIGN(PaintRecord);
 };
 
 }  // namespace txt
diff --git a/third_party/txt/src/txt/paragraph.cc b/third_party/txt/src/txt/paragraph.cc
index e034bc5df7f8ca801c8cb0e185de4da9190983c0..a376470f9a819ba5e0b9e1cf1f8fdcaa15caa080 100644
--- a/third_party/txt/src/txt/paragraph.cc
+++ b/third_party/txt/src/txt/paragraph.cc
@@ -25,9 +25,9 @@
 #include <vector>
 
 #include <minikin/Layout.h>
+#include "flutter/fml/logging.h"
 #include "font_collection.h"
 #include "font_skia.h"
-#include "lib/fxl/logging.h"
 #include "minikin/FontLanguageListCache.h"
 #include "minikin/GraphemeBreak.h"
 #include "minikin/HbFontCache.h"
@@ -283,7 +283,7 @@ bool Paragraph::ComputeLineBreaks() {
       std::shared_ptr<minikin::FontCollection> collection =
           GetMinikinFontCollectionForStyle(run.style);
       if (collection == nullptr) {
-        FXL_LOG(INFO) << "Could not find font collection for family \""
+        FML_LOG(INFO) << "Could not find font collection for family \""
                       << run.style.font_family << "\".";
         return false;
       }
diff --git a/third_party/txt/src/txt/paragraph.h b/third_party/txt/src/txt/paragraph.h
index 00c72788225c851e1787b06bac5cd923073b7050..e83be665eddb3a885445ef47e318b9bf29cbf84c 100644
--- a/third_party/txt/src/txt/paragraph.h
+++ b/third_party/txt/src/txt/paragraph.h
@@ -21,9 +21,9 @@
 #include <utility>
 #include <vector>
 
+#include "flutter/fml/compiler_specific.h"
+#include "flutter/fml/macros.h"
 #include "font_collection.h"
-#include "lib/fxl/compiler_specific.h"
-#include "lib/fxl/macros.h"
 #include "minikin/LineBreaker.h"
 #include "paint_record.h"
 #include "paragraph_style.h"
@@ -334,7 +334,7 @@ class Paragraph {
   // Get a default SkTypeface for a text style.
   sk_sp<SkTypeface> GetDefaultSkiaTypeface(const TextStyle& style);
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(Paragraph);
+  FML_DISALLOW_COPY_AND_ASSIGN(Paragraph);
 };
 
 }  // namespace txt
diff --git a/third_party/txt/src/txt/paragraph_builder.cc b/third_party/txt/src/txt/paragraph_builder.cc
index 24be160d4a0f0651003da406113b988bee3dc3ee..1a34b367a2226c0091927a5a55566dd624f4b770 100644
--- a/third_party/txt/src/txt/paragraph_builder.cc
+++ b/third_party/txt/src/txt/paragraph_builder.cc
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 
 #include <list>
 
diff --git a/third_party/txt/src/txt/paragraph_builder.h b/third_party/txt/src/txt/paragraph_builder.h
index 3b834e5652e636208cf0d0d2172f5bd3dd1153e3..31ae5bf06f3fcce8e1ec3c1a9d2d782b8203542c 100644
--- a/third_party/txt/src/txt/paragraph_builder.h
+++ b/third_party/txt/src/txt/paragraph_builder.h
@@ -20,8 +20,8 @@
 #include <memory>
 #include <string>
 
+#include "flutter/fml/macros.h"
 #include "font_collection.h"
-#include "lib/fxl/macros.h"
 #include "paragraph.h"
 #include "paragraph_style.h"
 #include "styled_runs.h"
@@ -82,7 +82,7 @@ class ParagraphBuilder {
 
   size_t PeekStyleIndex() const;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(ParagraphBuilder);
+  FML_DISALLOW_COPY_AND_ASSIGN(ParagraphBuilder);
 };
 
 }  // namespace txt
diff --git a/third_party/txt/src/txt/platform.h b/third_party/txt/src/txt/platform.h
index 6e974381ee0679c76b00b615aa0dcb19d66096e2..ed293c1967821584dc70594ebbe4237a1afb0670 100644
--- a/third_party/txt/src/txt/platform.h
+++ b/third_party/txt/src/txt/platform.h
@@ -6,7 +6,7 @@
 #define TXT_PLATFORM_H_
 
 #include <string>
-#include "lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 
 namespace txt {
 
diff --git a/third_party/txt/src/txt/styled_runs.cc b/third_party/txt/src/txt/styled_runs.cc
index ad76ccb110a653ff998e9491fd2706665d522642..7c7ba75db5ae4d2b9c8f7a2c6fa3e3f045543913 100644
--- a/third_party/txt/src/txt/styled_runs.cc
+++ b/third_party/txt/src/txt/styled_runs.cc
@@ -16,7 +16,7 @@
 
 #include "styled_runs.h"
 
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 #include "utils/WindowsUtils.h"
 
 namespace txt {
diff --git a/third_party/txt/src/txt/test_font_manager.cc b/third_party/txt/src/txt/test_font_manager.cc
index d5ce63da79ae6cffd332367432d267d2480c85b1..d5b1146fd4474664365e5677f83d85047d2c8354 100644
--- a/third_party/txt/src/txt/test_font_manager.cc
+++ b/third_party/txt/src/txt/test_font_manager.cc
@@ -15,7 +15,7 @@
  */
 
 #include "txt/test_font_manager.h"
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 
 namespace txt {
 
diff --git a/third_party/txt/src/txt/test_font_manager.h b/third_party/txt/src/txt/test_font_manager.h
index 0b1ba132ee7f0cfef13fc690352712835bef4c3c..1c2fc8966edc0cf8c1ad0e6774ab7c6506289265 100644
--- a/third_party/txt/src/txt/test_font_manager.h
+++ b/third_party/txt/src/txt/test_font_manager.h
@@ -20,7 +20,7 @@
 #include <memory>
 #include <string>
 
-#include "lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 #include "third_party/skia/include/core/SkFontMgr.h"
 #include "txt/asset_font_manager.h"
 #include "txt/font_asset_provider.h"
@@ -41,7 +41,7 @@ class TestFontManager : public AssetFontManager {
 
   SkFontStyleSet* onMatchFamily(const char family_name[]) const override;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(TestFontManager);
+  FML_DISALLOW_COPY_AND_ASSIGN(TestFontManager);
 };
 
 }  // namespace txt
diff --git a/third_party/txt/src/txt/typeface_font_asset_provider.cc b/third_party/txt/src/txt/typeface_font_asset_provider.cc
index a57af7d9d650fb49cd9f9578b8c6e021bcfad206..6a01d20f51d478d842115855e7317dee931fc33b 100644
--- a/third_party/txt/src/txt/typeface_font_asset_provider.cc
+++ b/third_party/txt/src/txt/typeface_font_asset_provider.cc
@@ -16,7 +16,7 @@
 
 #include "txt/typeface_font_asset_provider.h"
 
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 #include "third_party/skia/include/core/SkString.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 
@@ -93,7 +93,7 @@ int TypefaceFontStyleSet::count() {
 }
 
 void TypefaceFontStyleSet::getStyle(int index, SkFontStyle*, SkString* style) {
-  FXL_DCHECK(false);
+  FML_DCHECK(false);
 }
 
 SkTypeface* TypefaceFontStyleSet::createTypeface(int i) {
diff --git a/third_party/txt/src/txt/typeface_font_asset_provider.h b/third_party/txt/src/txt/typeface_font_asset_provider.h
index d540e059c3349bb763f7fe4952fffafe2aff4b42..70ad60f47ac986915e32b3782e3a0842c3770341 100644
--- a/third_party/txt/src/txt/typeface_font_asset_provider.h
+++ b/third_party/txt/src/txt/typeface_font_asset_provider.h
@@ -21,7 +21,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 #include "third_party/skia/include/core/SkFontMgr.h"
 #include "txt/font_asset_provider.h"
 
@@ -50,7 +50,7 @@ class TypefaceFontStyleSet : public SkFontStyleSet {
  private:
   std::vector<sk_sp<SkTypeface>> typefaces_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(TypefaceFontStyleSet);
+  FML_DISALLOW_COPY_AND_ASSIGN(TypefaceFontStyleSet);
 };
 
 class TypefaceFontAssetProvider : public FontAssetProvider {
@@ -76,7 +76,7 @@ class TypefaceFontAssetProvider : public FontAssetProvider {
   std::unordered_map<std::string, TypefaceFontStyleSet> registered_families_;
   std::vector<std::string> family_names_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(TypefaceFontAssetProvider);
+  FML_DISALLOW_COPY_AND_ASSIGN(TypefaceFontAssetProvider);
 };
 
 }  // namespace txt
diff --git a/third_party/txt/tests/font_collection_unittests.cc b/third_party/txt/tests/font_collection_unittests.cc
index fc81ad281c9504482798ba1e552415e734e13c45..6b935423d7c202610880bda325e5ba7f783ff5de 100644
--- a/third_party/txt/tests/font_collection_unittests.cc
+++ b/third_party/txt/tests/font_collection_unittests.cc
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "flutter/fml/command_line.h"
+#include "flutter/fml/logging.h"
 #include "gtest/gtest.h"
-#include "lib/fxl/command_line.h"
-#include "lib/fxl/logging.h"
 #include "txt/font_collection.h"
 #include "txt_test_utils.h"
 
diff --git a/third_party/txt/tests/paragraph_unittests.cc b/third_party/txt/tests/paragraph_unittests.cc
index 30c29a62c789a56567707fe4699a438ed0e0c24c..2631f3593029408cc0f70bb20b1c97e3119729a9 100644
--- a/third_party/txt/tests/paragraph_unittests.cc
+++ b/third_party/txt/tests/paragraph_unittests.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 #include "render_test.h"
 #include "third_party/icu/source/common/unicode/unistr.h"
 #include "third_party/skia/include/core/SkColor.h"
diff --git a/third_party/txt/tests/render_test.cc b/third_party/txt/tests/render_test.cc
index 6b4bde573db0cb1b8831506acab99e69f51ef0c1..c4a78c8dd249180e8dd1321bd30214fe03fcd9d0 100644
--- a/third_party/txt/tests/render_test.cc
+++ b/third_party/txt/tests/render_test.cc
@@ -18,7 +18,7 @@
 
 #include <string>
 
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 #include "third_party/skia/include/core/SkImageEncoder.h"
 #include "third_party/skia/include/core/SkStream.h"
 #include "txt/asset_font_manager.h"
@@ -64,7 +64,7 @@ bool RenderTest::Snapshot() {
   error = mkdir(snapshot_dir.c_str(), permissions);
 #endif
   if (error > 0) {
-    FXL_LOG(ERROR) << "'snapshot/' Directory not available and could not be "
+    FML_LOG(ERROR) << "'snapshot/' Directory not available and could not be "
                       "created. Please create manually to save snapshot.";
     return false;
   }
diff --git a/third_party/txt/tests/render_test.h b/third_party/txt/tests/render_test.h
index 7fb086fa30efdd0ed84fa1e1b098a78f2a8e4be4..eee8f2ad4ae8aae3858a5addc671638d1a2bffdf 100644
--- a/third_party/txt/tests/render_test.h
+++ b/third_party/txt/tests/render_test.h
@@ -16,8 +16,8 @@
 
 #include <memory>
 #include <string>
+#include "flutter/fml/macros.h"
 #include "gtest/gtest.h"
-#include "lib/fxl/macros.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "txt/font_collection.h"
@@ -53,7 +53,7 @@ class RenderTest : public ::testing::Test {
 
   std::string GetNextSnapshotName();
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(RenderTest);
+  FML_DISALLOW_COPY_AND_ASSIGN(RenderTest);
 };
 
 }  // namespace txt
diff --git a/third_party/txt/tests/txt_run_all_unittests.cc b/third_party/txt/tests/txt_run_all_unittests.cc
index a712566140c60f55e8a26f5fc97be531f3f6284e..992a167f0449ec0f2b10614cf0bf8bedbe895035 100644
--- a/third_party/txt/tests/txt_run_all_unittests.cc
+++ b/third_party/txt/tests/txt_run_all_unittests.cc
@@ -14,27 +14,27 @@
  * limitations under the License.
  */
 
+#include "flutter/fml/command_line.h"
 #include "flutter/fml/icu_util.h"
+#include "flutter/fml/logging.h"
 #include "gtest/gtest.h"
-#include "lib/fxl/command_line.h"
-#include "lib/fxl/logging.h"
 #include "third_party/skia/include/core/SkGraphics.h"
 #include "txt_test_utils.h"
 
 #include <cassert>
 
 int main(int argc, char** argv) {
-  fxl::CommandLine cmd = fxl::CommandLineFromArgcArgv(argc, argv);
+  fml::CommandLine cmd = fml::CommandLineFromArgcArgv(argc, argv);
   txt::SetCommandLine(cmd);
   std::string dir = txt::GetCommandLineForProcess().GetOptionValueWithDefault(
       "font-directory", "");
   txt::SetFontDir(dir);
   if (txt::GetFontDir().length() <= 0) {
-    FXL_LOG(ERROR) << "Font directory must be specified with "
+    FML_LOG(ERROR) << "Font directory must be specified with "
                       "--font-directory=\"<directory>\" to run this test.";
     return EXIT_FAILURE;
   }
-  FXL_DCHECK(txt::GetFontDir().length() > 0);
+  FML_DCHECK(txt::GetFontDir().length() > 0);
 
   fml::icu::InitializeICU("icudtl.dat");
   SkGraphics::Init();
diff --git a/third_party/txt/tests/txt_test_utils.cc b/third_party/txt/tests/txt_test_utils.cc
index da90b9cb73418553bd7a7f998e52d2c8fa1cdd3b..bc01c815effe9a56ee8c7c148af508bc075480e7 100644
--- a/third_party/txt/tests/txt_test_utils.cc
+++ b/third_party/txt/tests/txt_test_utils.cc
@@ -28,7 +28,7 @@
 namespace txt {
 
 static std::string gFontDir;
-static fxl::CommandLine gCommandLine;
+static fml::CommandLine gCommandLine;
 
 const std::string& GetFontDir() {
   return gFontDir;
@@ -38,11 +38,11 @@ void SetFontDir(const std::string& dir) {
   gFontDir = dir;
 }
 
-const fxl::CommandLine& GetCommandLineForProcess() {
+const fml::CommandLine& GetCommandLineForProcess() {
   return gCommandLine;
 }
 
-void SetCommandLine(fxl::CommandLine cmd) {
+void SetCommandLine(fml::CommandLine cmd) {
   gCommandLine = std::move(cmd);
 }
 
diff --git a/third_party/txt/tests/txt_test_utils.h b/third_party/txt/tests/txt_test_utils.h
index b69f3fa9842907722012fcbc3f409bba8ad05fe8..ed0844ed9d437b2cb2156bacc8176190334597d9 100644
--- a/third_party/txt/tests/txt_test_utils.h
+++ b/third_party/txt/tests/txt_test_utils.h
@@ -16,7 +16,7 @@
 
 #include <string>
 
-#include "lib/fxl/command_line.h"
+#include "flutter/fml/command_line.h"
 #include "txt/font_collection.h"
 
 namespace txt {
@@ -25,9 +25,9 @@ const std::string& GetFontDir();
 
 void SetFontDir(const std::string& dir);
 
-const fxl::CommandLine& GetCommandLineForProcess();
+const fml::CommandLine& GetCommandLineForProcess();
 
-void SetCommandLine(fxl::CommandLine cmd);
+void SetCommandLine(fml::CommandLine cmd);
 
 std::shared_ptr<FontCollection> GetTestFontCollection();
 
diff --git a/travis/licenses_golden/licenses_flutter b/travis/licenses_golden/licenses_flutter
index d3103a58e4356dd1dcf09c0e711a9ce3709293c5..dc110cc7204dfdf01396951fddcc36fc59bf02e2 100644
--- a/travis/licenses_golden/licenses_flutter
+++ b/travis/licenses_golden/licenses_flutter
@@ -581,6 +581,7 @@ FILE: ../../../flutter/fml/paths.cc
 FILE: ../../../flutter/fml/platform/fuchsia/paths_fuchsia.cc
 FILE: ../../../flutter/fml/platform/posix/file_posix.cc
 FILE: ../../../flutter/fml/platform/posix/native_library_posix.cc
+FILE: ../../../flutter/fml/platform/posix/paths_posix.cc
 FILE: ../../../flutter/fml/platform/win/file_win.cc
 FILE: ../../../flutter/fml/platform/win/native_library_win.cc
 FILE: ../../../flutter/fml/platform/win/wstring_conversion.h
@@ -634,17 +635,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: engine
-ORIGIN: ../../../flutter/lib/ui/painting/image.cc + ../../../LICENSE
+ORIGIN: ../../../flutter/fml/time/time_delta_unittest.cc + ../../../third_party/tonic/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../flutter/lib/ui/painting/image.cc
-FILE: ../../../flutter/lib/ui/painting/image.h
-FILE: ../../../flutter/shell/common/switches.cc
-FILE: ../../../flutter/shell/common/switches.h
-FILE: ../../../flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java
-FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterMain.java
-FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterView.java
+FILE: ../../../flutter/fml/export.h
+FILE: ../../../flutter/fml/time/time_delta_unittest.cc
+FILE: ../../../flutter/fml/time/time_point_unittest.cc
 ----------------------------------------------------------------------------------------------------
-Copyright 2013 The Chromium Authors. All rights reserved.
+Copyright 2017 The Fuchsia Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -675,13 +672,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: engine
-ORIGIN: ../../../garnet/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image.cc + ../../../LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../flutter/fml/export.h
-FILE: ../../../flutter/fml/time/time_delta_unittest.cc
-FILE: ../../../flutter/fml/time/time_point_unittest.cc
+FILE: ../../../flutter/lib/ui/painting/image.cc
+FILE: ../../../flutter/lib/ui/painting/image.h
+FILE: ../../../flutter/shell/common/switches.cc
+FILE: ../../../flutter/shell/common/switches.h
+FILE: ../../../flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterMain.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterView.java
 ----------------------------------------------------------------------------------------------------
-Copyright 2017 The Fuchsia Authors. All rights reserved.
+Copyright 2013 The Chromium Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -870,8 +871,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 LIBRARY: engine
 ORIGIN: ../../../third_party/tonic/LICENSE
 TYPE: LicenseType.bsd
+FILE: ../../../flutter/fml/arraysize.h
 FILE: ../../../flutter/fml/build_config.h
 FILE: ../../../flutter/fml/closure.h
+FILE: ../../../flutter/fml/command_line.cc
+FILE: ../../../flutter/fml/command_line.h
+FILE: ../../../flutter/fml/command_line_unittest.cc
 FILE: ../../../flutter/fml/compiler_specific.h
 FILE: ../../../flutter/fml/eintr_wrapper.h
 FILE: ../../../flutter/fml/log_level.h
@@ -880,6 +885,7 @@ FILE: ../../../flutter/fml/log_settings.h
 FILE: ../../../flutter/fml/log_settings_state.cc
 FILE: ../../../flutter/fml/logging.cc
 FILE: ../../../flutter/fml/logging.h
+FILE: ../../../flutter/fml/make_copyable.h
 FILE: ../../../flutter/fml/memory/ref_counted.h
 FILE: ../../../flutter/fml/memory/ref_counted_internal.h
 FILE: ../../../flutter/fml/memory/ref_counted_unittest.cc
@@ -890,6 +896,9 @@ FILE: ../../../flutter/fml/memory/weak_ptr.h
 FILE: ../../../flutter/fml/memory/weak_ptr_internal.cc
 FILE: ../../../flutter/fml/memory/weak_ptr_internal.h
 FILE: ../../../flutter/fml/memory/weak_ptr_unittest.cc
+FILE: ../../../flutter/fml/string_view.cc
+FILE: ../../../flutter/fml/string_view.h
+FILE: ../../../flutter/fml/string_view_unittest.cc
 FILE: ../../../flutter/fml/synchronization/thread_annotations.h
 FILE: ../../../flutter/fml/synchronization/thread_annotations_unittest.cc
 FILE: ../../../flutter/fml/synchronization/thread_checker.h
diff --git a/vulkan/BUILD.gn b/vulkan/BUILD.gn
index 1ab1cffcee54e5d6c262f9c368135e8ba4345934..2c021229456fa3d02c3c2738aa9347c182d6d4f2 100644
--- a/vulkan/BUILD.gn
+++ b/vulkan/BUILD.gn
@@ -58,7 +58,7 @@ source_set("vulkan") {
   }
 
   deps = [
-    "//garnet/public/lib/fxl",
+    "$flutter_root/fml",
     "//third_party/skia",
     "//third_party/skia:gpu",
   ]
diff --git a/vulkan/vulkan_application.cc b/vulkan/vulkan_application.cc
index eaba000274ca44bb8fcd9da73ec6684d5820a356..9404763ba9e6278cf9ee6d915b26d04d23b94267 100644
--- a/vulkan/vulkan_application.cc
+++ b/vulkan/vulkan_application.cc
@@ -86,29 +86,29 @@ VulkanApplication::VulkanApplication(
 
   if (VK_CALL_LOG_ERROR(vk.CreateInstance(&create_info, nullptr, &instance)) !=
       VK_SUCCESS) {
-    FXL_DLOG(INFO) << "Could not create application instance.";
+    FML_DLOG(INFO) << "Could not create application instance.";
     return;
   }
 
   // Now that we have an instance, setup instance proc table entries.
   if (!vk.SetupInstanceProcAddresses(instance)) {
-    FXL_DLOG(INFO) << "Could not setup instance proc addresses.";
+    FML_DLOG(INFO) << "Could not setup instance proc addresses.";
     return;
   }
 
   instance_ = {instance, [this](VkInstance i) {
-                 FXL_LOG(INFO) << "Destroying Vulkan instance";
+                 FML_LOG(INFO) << "Destroying Vulkan instance";
                  vk.DestroyInstance(i, nullptr);
                }};
 
   if (enable_instance_debugging) {
     auto debug_report = std::make_unique<VulkanDebugReport>(vk, instance_);
     if (!debug_report->IsValid()) {
-      FXL_LOG(INFO) << "Vulkan debugging was enabled but could not be setup "
+      FML_LOG(INFO) << "Vulkan debugging was enabled but could not be setup "
                        "for this instance.";
     } else {
       debug_report_ = std::move(debug_report);
-      FXL_DLOG(INFO) << "Debug reporting is enabled.";
+      FML_DLOG(INFO) << "Debug reporting is enabled.";
     }
   }
 
@@ -141,13 +141,13 @@ std::vector<VkPhysicalDevice> VulkanApplication::GetPhysicalDevices() const {
   uint32_t device_count = 0;
   if (VK_CALL_LOG_ERROR(vk.EnumeratePhysicalDevices(instance_, &device_count,
                                                     nullptr)) != VK_SUCCESS) {
-    FXL_DLOG(INFO) << "Could not enumerate physical device.";
+    FML_DLOG(INFO) << "Could not enumerate physical device.";
     return {};
   }
 
   if (device_count == 0) {
     // No available devices.
-    FXL_DLOG(INFO) << "No physical devices found.";
+    FML_DLOG(INFO) << "No physical devices found.";
     return {};
   }
 
@@ -157,7 +157,7 @@ std::vector<VkPhysicalDevice> VulkanApplication::GetPhysicalDevices() const {
 
   if (VK_CALL_LOG_ERROR(vk.EnumeratePhysicalDevices(
           instance_, &device_count, physical_devices.data())) != VK_SUCCESS) {
-    FXL_DLOG(INFO) << "Could not enumerate physical device.";
+    FML_DLOG(INFO) << "Could not enumerate physical device.";
     return {};
   }
 
@@ -172,7 +172,7 @@ VulkanApplication::AcquireFirstCompatibleLogicalDevice() const {
       return logical_device;
     }
   }
-  FXL_DLOG(INFO) << "Could not acquire compatible logical device.";
+  FML_DLOG(INFO) << "Could not acquire compatible logical device.";
   return nullptr;
 }
 
diff --git a/vulkan/vulkan_application.h b/vulkan/vulkan_application.h
index a5f20c07f63ec003f083b6354c911b3b5a35ff75..82a1bbbf61b4eecc655d56c4b64420a8582afd2d 100644
--- a/vulkan/vulkan_application.h
+++ b/vulkan/vulkan_application.h
@@ -8,9 +8,9 @@
 #include <memory>
 #include <string>
 #include <vector>
+#include "flutter/fml/macros.h"
 #include "flutter/vulkan/vulkan_debug_report.h"
 #include "flutter/vulkan/vulkan_handle.h"
-#include "lib/fxl/macros.h"
 
 namespace vulkan {
 
@@ -56,7 +56,7 @@ class VulkanApplication {
       const std::vector<VkExtensionProperties>& supported_extensions,
       std::string extension_name);
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(VulkanApplication);
+  FML_DISALLOW_COPY_AND_ASSIGN(VulkanApplication);
 };
 
 }  // namespace vulkan
diff --git a/vulkan/vulkan_backbuffer.cc b/vulkan/vulkan_backbuffer.cc
index 3ad3d21c1e1ad9f16aba97c9234d094142a6ce91..5943534063fda8b07fa199bbe0ca39a78f74f22f 100644
--- a/vulkan/vulkan_backbuffer.cc
+++ b/vulkan/vulkan_backbuffer.cc
@@ -21,17 +21,17 @@ VulkanBackbuffer::VulkanBackbuffer(const VulkanProcTable& p_vk,
       render_command_buffer_(p_vk, device, pool),
       valid_(false) {
   if (!usage_command_buffer_.IsValid() || !render_command_buffer_.IsValid()) {
-    FXL_DLOG(INFO) << "Command buffers were not valid.";
+    FML_DLOG(INFO) << "Command buffers were not valid.";
     return;
   }
 
   if (!CreateSemaphores()) {
-    FXL_DLOG(INFO) << "Could not create semaphores.";
+    FML_DLOG(INFO) << "Could not create semaphores.";
     return;
   }
 
   if (!CreateFences()) {
-    FXL_DLOG(INFO) << "Could not create fences.";
+    FML_DLOG(INFO) << "Could not create fences.";
     return;
   }
 
@@ -39,7 +39,7 @@ VulkanBackbuffer::VulkanBackbuffer(const VulkanProcTable& p_vk,
 }
 
 VulkanBackbuffer::~VulkanBackbuffer() {
-  FXL_ALLOW_UNUSED_LOCAL(WaitFences());
+  FML_ALLOW_UNUSED_LOCAL(WaitFences());
 }
 
 bool VulkanBackbuffer::IsValid() const {
diff --git a/vulkan/vulkan_backbuffer.h b/vulkan/vulkan_backbuffer.h
index ccf76bfc832ff256f49ccec76b8a085ad9c5f3c5..3de06f76af89f12858ee6c169ea7d5b71aa57c14 100644
--- a/vulkan/vulkan_backbuffer.h
+++ b/vulkan/vulkan_backbuffer.h
@@ -7,10 +7,10 @@
 
 #include <array>
 
+#include "flutter/fml/compiler_specific.h"
+#include "flutter/fml/macros.h"
 #include "flutter/vulkan/vulkan_command_buffer.h"
 #include "flutter/vulkan/vulkan_handle.h"
-#include "lib/fxl/compiler_specific.h"
-#include "lib/fxl/macros.h"
 #include "third_party/skia/include/core/SkSize.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
@@ -26,10 +26,10 @@ class VulkanBackbuffer {
 
   bool IsValid() const;
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool WaitFences();
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool ResetFences();
 
   const VulkanHandle<VkFence>& GetUsageFence() const;
@@ -57,7 +57,7 @@ class VulkanBackbuffer {
 
   bool CreateFences();
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(VulkanBackbuffer);
+  FML_DISALLOW_COPY_AND_ASSIGN(VulkanBackbuffer);
 };
 
 }  // namespace vulkan
diff --git a/vulkan/vulkan_command_buffer.cc b/vulkan/vulkan_command_buffer.cc
index 02a7af700a36dadc95efbf2daac595d06b307600..899963d9f204da201d98f2d5a6e9165e89e78aed 100644
--- a/vulkan/vulkan_command_buffer.cc
+++ b/vulkan/vulkan_command_buffer.cc
@@ -25,7 +25,7 @@ VulkanCommandBuffer::VulkanCommandBuffer(
 
   if (VK_CALL_LOG_ERROR(vk.AllocateCommandBuffers(device_, &allocate_info,
                                                   &buffer)) != VK_SUCCESS) {
-    FXL_DLOG(INFO) << "Could not allocate command buffers.";
+    FML_DLOG(INFO) << "Could not allocate command buffers.";
     return;
   }
 
diff --git a/vulkan/vulkan_command_buffer.h b/vulkan/vulkan_command_buffer.h
index fa419b48742158f89e967b9d5a06cd641367a935..f336a077ff3087408890750b9465e5e6ec465870 100644
--- a/vulkan/vulkan_command_buffer.h
+++ b/vulkan/vulkan_command_buffer.h
@@ -5,9 +5,9 @@
 #ifndef FLUTTER_VULKAN_VULKAN_COMMAND_BUFFER_H_
 #define FLUTTER_VULKAN_VULKAN_COMMAND_BUFFER_H_
 
+#include "flutter/fml/compiler_specific.h"
+#include "flutter/fml/macros.h"
 #include "flutter/vulkan/vulkan_handle.h"
-#include "lib/fxl/compiler_specific.h"
-#include "lib/fxl/macros.h"
 
 namespace vulkan {
 
@@ -25,13 +25,13 @@ class VulkanCommandBuffer {
 
   VkCommandBuffer Handle() const;
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool Begin() const;
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool End() const;
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool InsertPipelineBarrier(
       VkPipelineStageFlagBits src_stage_flags,
       VkPipelineStageFlagBits dest_stage_flags,
@@ -50,7 +50,7 @@ class VulkanCommandBuffer {
   VulkanHandle<VkCommandBuffer> handle_;
   bool valid_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(VulkanCommandBuffer);
+  FML_DISALLOW_COPY_AND_ASSIGN(VulkanCommandBuffer);
 };
 
 }  // namespace vulkan
diff --git a/vulkan/vulkan_debug_report.cc b/vulkan/vulkan_debug_report.cc
index a7e7a10888235f9b1d13daedcb410a7738893a42..96e32de8ac5665ae4d287592feeecb67e8c84082 100644
--- a/vulkan/vulkan_debug_report.cc
+++ b/vulkan/vulkan_debug_report.cc
@@ -7,15 +7,16 @@
 #include <iomanip>
 #include <vector>
 
+#include "flutter/fml/compiler_specific.h"
 #include "flutter/vulkan/vulkan_utilities.h"
 
 namespace vulkan {
 
-static const VkDebugReportFlagsEXT kVulkanErrorFlags FXL_ALLOW_UNUSED_TYPE =
+static const VkDebugReportFlagsEXT kVulkanErrorFlags FML_ALLOW_UNUSED_TYPE =
     VK_DEBUG_REPORT_WARNING_BIT_EXT |
     VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT | VK_DEBUG_REPORT_ERROR_BIT_EXT;
 
-static const VkDebugReportFlagsEXT kVulkanInfoFlags FXL_ALLOW_UNUSED_TYPE =
+static const VkDebugReportFlagsEXT kVulkanInfoFlags FML_ALLOW_UNUSED_TYPE =
     VK_DEBUG_REPORT_INFORMATION_BIT_EXT | VK_DEBUG_REPORT_DEBUG_BIT_EXT;
 
 std::string VulkanDebugReport::DebugExtensionName() {
@@ -164,12 +165,12 @@ OnVulkanDebugReportCallback(VkDebugReportFlagsEXT flags,
 
   if (flags & kVulkanErrorFlags) {
     if (ValidationErrorsFatal()) {
-      FXL_DCHECK(false) << stream.str();
+      FML_DCHECK(false) << stream.str();
     } else {
-      FXL_LOG(ERROR) << stream.str();
+      FML_LOG(ERROR) << stream.str();
     }
   } else {
-    FXL_LOG(INFO) << stream.str();
+    FML_LOG(INFO) << stream.str();
   }
 
   // Returning false tells the layer not to stop when the event occurs, so
diff --git a/vulkan/vulkan_debug_report.h b/vulkan/vulkan_debug_report.h
index 80f886e2e94aae89817597339b2a34cce47d6747..31e1b548a3e021f5615977afd6920275c653351d 100644
--- a/vulkan/vulkan_debug_report.h
+++ b/vulkan/vulkan_debug_report.h
@@ -5,10 +5,10 @@
 #ifndef FLUTTER_VULKAN_VULKAN_DEBUG_REPORT_H_
 #define FLUTTER_VULKAN_VULKAN_DEBUG_REPORT_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/vulkan/vulkan_handle.h"
 #include "flutter/vulkan/vulkan_interface.h"
 #include "flutter/vulkan/vulkan_proc_table.h"
-#include "lib/fxl/macros.h"
 
 namespace vulkan {
 
@@ -29,7 +29,7 @@ class VulkanDebugReport {
   VulkanHandle<VkDebugReportCallbackEXT> handle_;
   bool valid_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(VulkanDebugReport);
+  FML_DISALLOW_COPY_AND_ASSIGN(VulkanDebugReport);
 };
 
 }  // namespace vulkan
diff --git a/vulkan/vulkan_device.cc b/vulkan/vulkan_device.cc
index bb6c2e8a1437c3f3b177bcee1608e968d1570c23..1cb7fc41b4d7f03d6d871d878204a838cec0867b 100644
--- a/vulkan/vulkan_device.cc
+++ b/vulkan/vulkan_device.cc
@@ -42,7 +42,7 @@ VulkanDevice::VulkanDevice(VulkanProcTable& p_vk,
   graphics_queue_index_ = FindGraphicsQueueIndex(GetQueueFamilyProperties());
 
   if (graphics_queue_index_ == kVulkanInvalidGraphicsQueueIndex) {
-    FXL_DLOG(INFO) << "Could not find the graphics queue index.";
+    FML_DLOG(INFO) << "Could not find the graphics queue index.";
     return;
   }
 
@@ -92,7 +92,7 @@ VulkanDevice::VulkanDevice(VulkanProcTable& p_vk,
 
   if (VK_CALL_LOG_ERROR(vk.CreateDevice(physical_device_, &create_info, nullptr,
                                         &device)) != VK_SUCCESS) {
-    FXL_DLOG(INFO) << "Could not create device.";
+    FML_DLOG(INFO) << "Could not create device.";
     return;
   }
 
@@ -100,7 +100,7 @@ VulkanDevice::VulkanDevice(VulkanProcTable& p_vk,
              [this](VkDevice device) { vk.DestroyDevice(device, nullptr); }};
 
   if (!vk.SetupDeviceProcAddresses(device_)) {
-    FXL_DLOG(INFO) << "Could not setup device proc addresses.";
+    FML_DLOG(INFO) << "Could not setup device proc addresses.";
     return;
   }
 
@@ -109,7 +109,7 @@ VulkanDevice::VulkanDevice(VulkanProcTable& p_vk,
   vk.GetDeviceQueue(device_, graphics_queue_index_, 0, &queue);
 
   if (queue == VK_NULL_HANDLE) {
-    FXL_DLOG(INFO) << "Could not get the device queue handle.";
+    FML_DLOG(INFO) << "Could not get the device queue handle.";
     return;
   }
 
@@ -126,7 +126,7 @@ VulkanDevice::VulkanDevice(VulkanProcTable& p_vk,
   if (VK_CALL_LOG_ERROR(vk.CreateCommandPool(device_, &command_pool_create_info,
                                              nullptr, &command_pool)) !=
       VK_SUCCESS) {
-    FXL_DLOG(INFO) << "Could not create the command pool.";
+    FML_DLOG(INFO) << "Could not create the command pool.";
     return;
   }
 
@@ -138,7 +138,7 @@ VulkanDevice::VulkanDevice(VulkanProcTable& p_vk,
 }
 
 VulkanDevice::~VulkanDevice() {
-  FXL_ALLOW_UNUSED_LOCAL(WaitIdle());
+  FML_ALLOW_UNUSED_LOCAL(WaitIdle());
 }
 
 bool VulkanDevice::IsValid() const {
diff --git a/vulkan/vulkan_device.h b/vulkan/vulkan_device.h
index e9abf757f6a94d4f41631b8f113d373b4a30f761..d48b02934a90f5f4d68b189f245542bad25d4af4 100644
--- a/vulkan/vulkan_device.h
+++ b/vulkan/vulkan_device.h
@@ -7,9 +7,9 @@
 
 #include <vector>
 
+#include "flutter/fml/compiler_specific.h"
+#include "flutter/fml/macros.h"
 #include "flutter/vulkan/vulkan_handle.h"
-#include "lib/fxl/compiler_specific.h"
-#include "lib/fxl/macros.h"
 
 namespace vulkan {
 
@@ -37,34 +37,34 @@ class VulkanDevice {
 
   void ReleaseDeviceOwnership();
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool GetSurfaceCapabilities(const VulkanSurface& surface,
                               VkSurfaceCapabilitiesKHR* capabilities) const;
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool GetPhysicalDeviceFeatures(VkPhysicalDeviceFeatures* features) const;
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool GetPhysicalDeviceFeaturesSkia(
       uint32_t* /* mask of GrVkFeatureFlags */ features) const;
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   int ChooseSurfaceFormat(const VulkanSurface& surface,
                           std::vector<VkFormat> desired_formats,
                           VkSurfaceFormatKHR* format) const;
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool ChoosePresentMode(const VulkanSurface& surface,
                          VkPresentModeKHR* present_mode) const;
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool QueueSubmit(std::vector<VkPipelineStageFlags> wait_dest_pipeline_stages,
                    const std::vector<VkSemaphore>& wait_semaphores,
                    const std::vector<VkSemaphore>& signal_semaphores,
                    const std::vector<VkCommandBuffer>& command_buffers,
                    const VulkanHandle<VkFence>& fence) const;
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool WaitIdle() const;
 
  private:
@@ -78,7 +78,7 @@ class VulkanDevice {
 
   std::vector<VkQueueFamilyProperties> GetQueueFamilyProperties() const;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(VulkanDevice);
+  FML_DISALLOW_COPY_AND_ASSIGN(VulkanDevice);
 };
 
 }  // namespace vulkan
diff --git a/vulkan/vulkan_handle.h b/vulkan/vulkan_handle.h
index 87f535e9b913231595ac10fd218fadfc9463c462..60be8a5f19fec77dcff6274a2cc2e28f7fe06558 100644
--- a/vulkan/vulkan_handle.h
+++ b/vulkan/vulkan_handle.h
@@ -7,8 +7,8 @@
 
 #include <functional>
 
-#include "lib/fxl/logging.h"
-#include "lib/fxl/macros.h"
+#include "flutter/fml/logging.h"
+#include "flutter/fml/macros.h"
 #include "vulkan_interface.h"
 
 namespace vulkan {
@@ -72,7 +72,7 @@ class VulkanHandle {
     disposer_ = nullptr;
   }
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(VulkanHandle);
+  FML_DISALLOW_COPY_AND_ASSIGN(VulkanHandle);
 };
 
 }  // namespace vulkan
diff --git a/vulkan/vulkan_image.h b/vulkan/vulkan_image.h
index 776d34117ec12557f84c4894f922afa6cf8722fe..0ab54631549732b568e2e5152837a73b9a742dda 100644
--- a/vulkan/vulkan_image.h
+++ b/vulkan/vulkan_image.h
@@ -5,9 +5,9 @@
 #ifndef FLUTTER_VULKAN_VULKAN_IMAGE_H_
 #define FLUTTER_VULKAN_VULKAN_IMAGE_H_
 
+#include "flutter/fml/compiler_specific.h"
+#include "flutter/fml/macros.h"
 #include "flutter/vulkan/vulkan_handle.h"
-#include "lib/fxl/compiler_specific.h"
-#include "lib/fxl/macros.h"
 
 namespace vulkan {
 
@@ -22,7 +22,7 @@ class VulkanImage {
 
   bool IsValid() const;
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool InsertImageMemoryBarrier(const VulkanCommandBuffer& command_buffer,
                                 VkPipelineStageFlagBits src_pipline_bits,
                                 VkPipelineStageFlagBits dest_pipline_bits,
@@ -35,7 +35,7 @@ class VulkanImage {
   uint32_t /* mask of VkAccessFlagBits */ access_flags_;
   bool valid_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(VulkanImage);
+  FML_DISALLOW_COPY_AND_ASSIGN(VulkanImage);
 };
 
 }  // namespace vulkan
diff --git a/vulkan/vulkan_interface.h b/vulkan/vulkan_interface.h
index 2eb7ff5bd1a383b024c40fadd165f3311d2614b2..f96b99eb8cb9cfd181a4fd567ef188377b5eb019 100644
--- a/vulkan/vulkan_interface.h
+++ b/vulkan/vulkan_interface.h
@@ -7,8 +7,8 @@
 
 #include <string>
 
-#include "lib/fxl/build_config.h"
-#include "lib/fxl/logging.h"
+#include "flutter/fml/build_config.h"
+#include "flutter/fml/logging.h"
 
 #define VULKAN_LINK_STATICALLY OS_FUCHSIA
 
@@ -36,7 +36,7 @@
   ({                                                       \
     __typeof__(expression) _rc = (expression);             \
     if (_rc != VK_SUCCESS) {                               \
-      FXL_DLOG(INFO) << "Vulkan call '" << #expression     \
+      FML_DLOG(INFO) << "Vulkan call '" << #expression     \
                      << "' failed with error "             \
                      << vulkan::VulkanResultToString(_rc); \
     }                                                      \
diff --git a/vulkan/vulkan_native_surface.h b/vulkan/vulkan_native_surface.h
index bf527362814773dee9f4401927de2b991feb0474..e66bf01d030a165b19c4a69e5b767caab193823c 100644
--- a/vulkan/vulkan_native_surface.h
+++ b/vulkan/vulkan_native_surface.h
@@ -5,7 +5,7 @@
 #ifndef FLUTTER_VULKAN_VULKAN_NATIVE_SURFACE_H_
 #define FLUTTER_VULKAN_VULKAN_NATIVE_SURFACE_H_
 
-#include "lib/fxl/macros.h"
+#include "flutter/fml/macros.h"
 #include "third_party/skia/include/core/SkSize.h"
 #include "vulkan_handle.h"
 #include "vulkan_proc_table.h"
diff --git a/vulkan/vulkan_native_surface_android.h b/vulkan/vulkan_native_surface_android.h
index 16d5e90742812ac93d61847b5ead24917a0a3c83..bd327d345ca77095646d7f630a5f8b2accc5e33a 100644
--- a/vulkan/vulkan_native_surface_android.h
+++ b/vulkan/vulkan_native_surface_android.h
@@ -5,8 +5,8 @@
 #ifndef FLUTTER_VULKAN_VULKAN_NATIVE_SURFACE_ANDROID_H_
 #define FLUTTER_VULKAN_VULKAN_NATIVE_SURFACE_ANDROID_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/vulkan/vulkan_native_surface.h"
-#include "lib/fxl/macros.h"
 
 struct ANativeWindow;
 typedef struct ANativeWindow ANativeWindow;
@@ -36,7 +36,7 @@ class VulkanNativeSurfaceAndroid : public VulkanNativeSurface {
  private:
   ANativeWindow* native_window_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(VulkanNativeSurfaceAndroid);
+  FML_DISALLOW_COPY_AND_ASSIGN(VulkanNativeSurfaceAndroid);
 };
 
 }  // namespace vulkan
diff --git a/vulkan/vulkan_native_surface_magma.h b/vulkan/vulkan_native_surface_magma.h
index b9ea61db5a802eaf7d51cc680a5f06ac54f11bc5..87373289a834d62477315708801a87230b44cbb0 100644
--- a/vulkan/vulkan_native_surface_magma.h
+++ b/vulkan/vulkan_native_surface_magma.h
@@ -5,8 +5,8 @@
 #ifndef FLUTTER_VULKAN_VULKAN_NATIVE_SURFACE_MAGMA_H_
 #define FLUTTER_VULKAN_VULKAN_NATIVE_SURFACE_MAGMA_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/vulkan/vulkan_native_surface.h"
-#include "lib/fxl/macros.h"
 
 namespace vulkan {
 
@@ -35,7 +35,7 @@ class VulkanNativeSurfaceMagma : public vulkan::VulkanNativeSurface {
 
  private:
   SkISize size_;
-  FXL_DISALLOW_COPY_AND_ASSIGN(VulkanNativeSurfaceMagma);
+  FML_DISALLOW_COPY_AND_ASSIGN(VulkanNativeSurfaceMagma);
 };
 
 }  // namespace vulkan
diff --git a/vulkan/vulkan_proc_table.cc b/vulkan/vulkan_proc_table.cc
index b759298139774b612093faa7118b91c927e7272d..bab2b9b54962d5a1dde113f8de0b124f3116b938 100644
--- a/vulkan/vulkan_proc_table.cc
+++ b/vulkan/vulkan_proc_table.cc
@@ -6,11 +6,11 @@
 
 #include <dlfcn.h>
 
-#include "lib/fxl/logging.h"
+#include "flutter/fml/logging.h"
 
 #define ACQUIRE_PROC(name, context)                          \
   if (!(name = AcquireProc("vk" #name, context))) {          \
-    FXL_DLOG(INFO) << "Could not acquire proc: vk" << #name; \
+    FML_DLOG(INFO) << "Could not acquire proc: vk" << #name; \
     return false;                                            \
   }
 
@@ -56,7 +56,7 @@ bool VulkanProcTable::SetupLoaderProcAddresses() {
 #endif  // VULKAN_LINK_STATICALLY
 
   if (!GetInstanceProcAddr) {
-    FXL_DLOG(WARNING) << "Could not acquire vkGetInstanceProcAddr.";
+    FML_DLOG(WARNING) << "Could not acquire vkGetInstanceProcAddr.";
     return false;
   }
 
@@ -160,7 +160,7 @@ bool VulkanProcTable::OpenLibraryHandle() {
   dlerror();  // clear existing errors on thread.
   handle_ = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
   if (handle_ == nullptr) {
-    FXL_DLOG(WARNING) << "Could not open the vulkan library: " << dlerror();
+    FML_DLOG(WARNING) << "Could not open the vulkan library: " << dlerror();
     return false;
   }
   return true;
@@ -175,9 +175,9 @@ bool VulkanProcTable::CloseLibraryHandle() {
   if (handle_ != nullptr) {
     dlerror();  // clear existing errors on thread.
     if (dlclose(handle_) != 0) {
-      FXL_DLOG(ERROR) << "Could not close the vulkan library handle. This "
+      FML_DLOG(ERROR) << "Could not close the vulkan library handle. This "
                          "indicates a leak.";
-      FXL_DLOG(ERROR) << dlerror();
+      FML_DLOG(ERROR) << dlerror();
     }
     handle_ = nullptr;
   }
diff --git a/vulkan/vulkan_proc_table.h b/vulkan/vulkan_proc_table.h
index 45e40196b594dcc7f3f6d2b03662d04e4bed636e..54986a71a71381cffc5d021c879cb883d51d629c 100644
--- a/vulkan/vulkan_proc_table.h
+++ b/vulkan/vulkan_proc_table.h
@@ -5,19 +5,19 @@
 #ifndef FLUTTER_VULKAN_VULKAN_PROC_TABLE_H_
 #define FLUTTER_VULKAN_VULKAN_PROC_TABLE_H_
 
+#include "flutter/fml/macros.h"
+#include "flutter/fml/memory/ref_counted.h"
+#include "flutter/fml/memory/ref_ptr.h"
 #include "flutter/vulkan/vulkan_handle.h"
 #include "flutter/vulkan/vulkan_interface.h"
-#include "lib/fxl/macros.h"
-#include "lib/fxl/memory/ref_counted.h"
-#include "lib/fxl/memory/ref_ptr.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/gpu/vk/GrVkBackendContext.h"
 
 namespace vulkan {
 
-class VulkanProcTable : public fxl::RefCountedThreadSafe<VulkanProcTable> {
-  FRIEND_REF_COUNTED_THREAD_SAFE(VulkanProcTable);
-  FRIEND_MAKE_REF_COUNTED(VulkanProcTable);
+class VulkanProcTable : public fml::RefCountedThreadSafe<VulkanProcTable> {
+  FML_FRIEND_REF_COUNTED_THREAD_SAFE(VulkanProcTable);
+  FML_FRIEND_MAKE_REF_COUNTED(VulkanProcTable);
 
  public:
   template <class T>
@@ -140,7 +140,7 @@ class VulkanProcTable : public fxl::RefCountedThreadSafe<VulkanProcTable> {
   PFN_vkVoidFunction AcquireProc(const char* proc_name,
                                  const VulkanHandle<VkDevice>& device) const;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(VulkanProcTable);
+  FML_DISALLOW_COPY_AND_ASSIGN(VulkanProcTable);
 };
 
 }  // namespace vulkan
diff --git a/vulkan/vulkan_surface.cc b/vulkan/vulkan_surface.cc
index 299fa0a40d7dfc4520d3f1faa39fe6ed3f013de5..286438d0a3f5ea613bd98d78ae6c6b063530b6fb 100644
--- a/vulkan/vulkan_surface.cc
+++ b/vulkan/vulkan_surface.cc
@@ -18,7 +18,7 @@ VulkanSurface::VulkanSurface(
       native_surface_(std::move(native_surface)),
       valid_(false) {
   if (native_surface_ == nullptr || !native_surface_->IsValid()) {
-    FXL_DLOG(INFO) << "Native surface was invalid.";
+    FML_DLOG(INFO) << "Native surface was invalid.";
     return;
   }
 
@@ -26,7 +26,7 @@ VulkanSurface::VulkanSurface(
       native_surface_->CreateSurfaceHandle(vk, application.GetInstance());
 
   if (surface == VK_NULL_HANDLE) {
-    FXL_DLOG(INFO) << "Could not create the surface handle.";
+    FML_DLOG(INFO) << "Could not create the surface handle.";
     return;
   }
 
diff --git a/vulkan/vulkan_surface.h b/vulkan/vulkan_surface.h
index 358b3caa0490549d0749f57d403de12bbc89c1cf..81dd7cdfb727802ab418cf9c3ff5cce3ad76fc75 100644
--- a/vulkan/vulkan_surface.h
+++ b/vulkan/vulkan_surface.h
@@ -5,8 +5,8 @@
 #ifndef FLUTTER_VULKAN_VULKAN_SURFACE_H_
 #define FLUTTER_VULKAN_VULKAN_SURFACE_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/vulkan/vulkan_handle.h"
-#include "lib/fxl/macros.h"
 #include "third_party/skia/include/core/SkSize.h"
 
 namespace vulkan {
@@ -39,7 +39,7 @@ class VulkanSurface {
   VulkanHandle<VkSurfaceKHR> surface_;
   bool valid_;
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(VulkanSurface);
+  FML_DISALLOW_COPY_AND_ASSIGN(VulkanSurface);
 };
 
 }  // namespace vulkan
diff --git a/vulkan/vulkan_swapchain.cc b/vulkan/vulkan_swapchain.cc
index c59c16620fbfed7c9f201e7ac9708b23f316b0cd..595614760aa1db5609258a22a5aa2546f66e51ae 100644
--- a/vulkan/vulkan_swapchain.cc
+++ b/vulkan/vulkan_swapchain.cc
@@ -51,12 +51,12 @@ VulkanSwapchain::VulkanSwapchain(const VulkanProcTable& p_vk,
       current_image_index_(0),
       valid_(false) {
   if (!device_.IsValid() || !surface.IsValid() || skia_context == nullptr) {
-    FXL_DLOG(INFO) << "Device or surface is invalid.";
+    FML_DLOG(INFO) << "Device or surface is invalid.";
     return;
   }
 
   if (!device_.GetSurfaceCapabilities(surface, &capabilities_)) {
-    FXL_DLOG(INFO) << "Could not find surface capabilities.";
+    FML_DLOG(INFO) << "Could not find surface capabilities.";
     return;
   }
 
@@ -74,13 +74,13 @@ VulkanSwapchain::VulkanSwapchain(const VulkanProcTable& p_vk,
   int format_index =
       device_.ChooseSurfaceFormat(surface, desired_formats, &surface_format_);
   if (format_index < 0) {
-    FXL_DLOG(INFO) << "Could not choose surface format.";
+    FML_DLOG(INFO) << "Could not choose surface format.";
     return;
   }
 
   VkPresentModeKHR present_mode = VK_PRESENT_MODE_FIFO_KHR;
   if (!device_.ChoosePresentMode(surface, &present_mode)) {
-    FXL_DLOG(INFO) << "Could not choose present mode.";
+    FML_DLOG(INFO) << "Could not choose present mode.";
     return;
   }
 
@@ -92,12 +92,12 @@ VulkanSwapchain::VulkanSwapchain(const VulkanProcTable& p_vk,
           queue_family_index,                 // queue family
           surface.Handle(),                   // surface to test
           &supported)) != VK_SUCCESS) {
-    FXL_DLOG(INFO) << "Could not get physical device surface support.";
+    FML_DLOG(INFO) << "Could not get physical device surface support.";
     return;
   }
 
   if (supported != VK_TRUE) {
-    FXL_DLOG(INFO) << "Surface was not supported by the physical device.";
+    FML_DLOG(INFO) << "Surface was not supported by the physical device.";
     return;
   }
 
@@ -139,12 +139,12 @@ VulkanSwapchain::VulkanSwapchain(const VulkanProcTable& p_vk,
   if (VK_CALL_LOG_ERROR(vk.CreateSwapchainKHR(device_.GetHandle(), &create_info,
                                               nullptr, &swapchain)) !=
       VK_SUCCESS) {
-    FXL_DLOG(INFO) << "Could not create the swapchain.";
+    FML_DLOG(INFO) << "Could not create the swapchain.";
     return;
   }
 
   swapchain_ = {swapchain, [this](VkSwapchainKHR swapchain) {
-                  FXL_ALLOW_UNUSED_LOCAL(device_.WaitIdle());
+                  FML_ALLOW_UNUSED_LOCAL(device_.WaitIdle());
                   vk.DestroySwapchainKHR(device_.GetHandle(), swapchain,
                                          nullptr);
                 }};
@@ -152,7 +152,7 @@ VulkanSwapchain::VulkanSwapchain(const VulkanProcTable& p_vk,
   if (!CreateSwapchainImages(skia_context,
                              format_infos[format_index].color_type_,
                              format_infos[format_index].color_space_)) {
-    FXL_DLOG(INFO) << "Could not create swapchain images.";
+    FML_DLOG(INFO) << "Could not create swapchain images.";
     return;
   }
 
@@ -288,8 +288,8 @@ bool VulkanSwapchain::CreateSwapchainImages(GrContext* skia_context,
     surfaces_.emplace_back(std::move(surface));
   }
 
-  FXL_DCHECK(backbuffers_.size() == images_.size());
-  FXL_DCHECK(images_.size() == surfaces_.size());
+  FML_DCHECK(backbuffers_.size() == images_.size());
+  FML_DCHECK(images_.size() == surfaces_.size());
 
   return true;
 }
@@ -318,7 +318,7 @@ VulkanSwapchain::AcquireResult VulkanSwapchain::AcquireSurface() {
   AcquireResult error = {AcquireStatus::ErrorSurfaceLost, nullptr};
 
   if (!IsValid()) {
-    FXL_DLOG(INFO) << "Swapchain was invalid.";
+    FML_DLOG(INFO) << "Swapchain was invalid.";
     return error;
   }
 
@@ -329,7 +329,7 @@ VulkanSwapchain::AcquireResult VulkanSwapchain::AcquireSurface() {
   auto backbuffer = GetNextBackbuffer();
 
   if (backbuffer == nullptr) {
-    FXL_DLOG(INFO) << "Could not get the next backbuffer.";
+    FML_DLOG(INFO) << "Could not get the next backbuffer.";
     return error;
   }
 
@@ -338,7 +338,7 @@ VulkanSwapchain::AcquireResult VulkanSwapchain::AcquireSurface() {
   // Wait for use readiness.
   // ---------------------------------------------------------------------------
   if (!backbuffer->WaitFences()) {
-    FXL_DLOG(INFO) << "Failed waiting on fences.";
+    FML_DLOG(INFO) << "Failed waiting on fences.";
     return error;
   }
 
@@ -347,7 +347,7 @@ VulkanSwapchain::AcquireResult VulkanSwapchain::AcquireSurface() {
   // Put semaphores in unsignaled state.
   // ---------------------------------------------------------------------------
   if (!backbuffer->ResetFences()) {
-    FXL_DLOG(INFO) << "Could not reset fences.";
+    FML_DLOG(INFO) << "Could not reset fences.";
     return error;
   }
 
@@ -373,20 +373,20 @@ VulkanSwapchain::AcquireResult VulkanSwapchain::AcquireSurface() {
     case VK_ERROR_SURFACE_LOST_KHR:
       return {AcquireStatus::ErrorSurfaceLost, nullptr};
     default:
-      FXL_LOG(INFO) << "Unexpected result from AcquireNextImageKHR: "
+      FML_LOG(INFO) << "Unexpected result from AcquireNextImageKHR: "
                     << acquire_result;
       return {AcquireStatus::ErrorSurfaceLost, nullptr};
   }
 
   // Simple sanity checking of image index.
   if (next_image_index >= images_.size()) {
-    FXL_DLOG(INFO) << "Image index returned was out-of-bounds.";
+    FML_DLOG(INFO) << "Image index returned was out-of-bounds.";
     return error;
   }
 
   auto& image = images_[next_image_index];
   if (!image->IsValid()) {
-    FXL_DLOG(INFO) << "Image at index was invalid.";
+    FML_DLOG(INFO) << "Image at index was invalid.";
     return error;
   }
 
@@ -395,7 +395,7 @@ VulkanSwapchain::AcquireResult VulkanSwapchain::AcquireSurface() {
   // Start recording to the command buffer.
   // ---------------------------------------------------------------------------
   if (!backbuffer->GetUsageCommandBuffer().Begin()) {
-    FXL_DLOG(INFO) << "Could not begin recording to the command buffer.";
+    FML_DLOG(INFO) << "Could not begin recording to the command buffer.";
     return error;
   }
 
@@ -415,7 +415,7 @@ VulkanSwapchain::AcquireResult VulkanSwapchain::AcquireSurface() {
           VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,  // dest_access_flags
           destination_image_layout               // dest_layout
           )) {
-    FXL_DLOG(INFO) << "Could not insert image memory barrier.";
+    FML_DLOG(INFO) << "Could not insert image memory barrier.";
     return error;
   } else {
     current_pipeline_stage_ = destination_pipeline_stage;
@@ -426,7 +426,7 @@ VulkanSwapchain::AcquireResult VulkanSwapchain::AcquireSurface() {
   // End recording to the command buffer.
   // ---------------------------------------------------------------------------
   if (!backbuffer->GetUsageCommandBuffer().End()) {
-    FXL_DLOG(INFO) << "Could not end recording to the command buffer.";
+    FML_DLOG(INFO) << "Could not end recording to the command buffer.";
     return error;
   }
 
@@ -446,7 +446,7 @@ VulkanSwapchain::AcquireResult VulkanSwapchain::AcquireSurface() {
           command_buffers,               // command_buffers
           backbuffer->GetUsageFence()    // fence
           )) {
-    FXL_DLOG(INFO) << "Could not submit to the device queue.";
+    FML_DLOG(INFO) << "Could not submit to the device queue.";
     return error;
   }
 
@@ -457,14 +457,14 @@ VulkanSwapchain::AcquireResult VulkanSwapchain::AcquireSurface() {
   sk_sp<SkSurface> surface = surfaces_[next_image_index];
 
   if (surface == nullptr) {
-    FXL_DLOG(INFO) << "Could not access surface at the image index.";
+    FML_DLOG(INFO) << "Could not access surface at the image index.";
     return error;
   }
 
   GrBackendRenderTarget backendRT = surface->getBackendRenderTarget(
       SkSurface::kFlushRead_BackendHandleAccess);
   if (!backendRT.isValid()) {
-    FXL_DLOG(INFO) << "Could not get backend render target.";
+    FML_DLOG(INFO) << "Could not get backend render target.";
     return error;
   }
   backendRT.setVkImageLayout(destination_image_layout);
@@ -476,7 +476,7 @@ VulkanSwapchain::AcquireResult VulkanSwapchain::AcquireSurface() {
 
 bool VulkanSwapchain::Submit() {
   if (!IsValid()) {
-    FXL_DLOG(INFO) << "Swapchain was invalid.";
+    FML_DLOG(INFO) << "Swapchain was invalid.";
     return false;
   }
 
@@ -495,7 +495,7 @@ bool VulkanSwapchain::Submit() {
   // Start recording to the command buffer.
   // ---------------------------------------------------------------------------
   if (!backbuffer->GetRenderCommandBuffer().Begin()) {
-    FXL_DLOG(INFO) << "Could not start recording to the command buffer.";
+    FML_DLOG(INFO) << "Could not start recording to the command buffer.";
     return false;
   }
 
@@ -514,7 +514,7 @@ bool VulkanSwapchain::Submit() {
           VK_ACCESS_MEMORY_READ_BIT,             // dest_access_flags
           destination_image_layout               // dest_layout
           )) {
-    FXL_DLOG(INFO) << "Could not insert memory barrier.";
+    FML_DLOG(INFO) << "Could not insert memory barrier.";
     return false;
   } else {
     current_pipeline_stage_ = destination_pipeline_stage;
@@ -525,7 +525,7 @@ bool VulkanSwapchain::Submit() {
   // End recording to the command buffer.
   // ---------------------------------------------------------------------------
   if (!backbuffer->GetRenderCommandBuffer().End()) {
-    FXL_DLOG(INFO) << "Could not end recording to the command buffer.";
+    FML_DLOG(INFO) << "Could not end recording to the command buffer.";
     return false;
   }
 
@@ -547,7 +547,7 @@ bool VulkanSwapchain::Submit() {
           command_buffers,                     // command_buffers
           backbuffer->GetRenderFence()         // fence
           )) {
-    FXL_DLOG(INFO) << "Could not submit to the device queue.";
+    FML_DLOG(INFO) << "Could not submit to the device queue.";
     return false;
   }
 
@@ -571,7 +571,7 @@ bool VulkanSwapchain::Submit() {
 
   if (VK_CALL_LOG_ERROR(vk.QueuePresentKHR(device_.GetQueueHandle(),
                                            &present_info)) != VK_SUCCESS) {
-    FXL_DLOG(INFO) << "Could not submit the present operation.";
+    FML_DLOG(INFO) << "Could not submit the present operation.";
     return false;
   }
 
diff --git a/vulkan/vulkan_swapchain.h b/vulkan/vulkan_swapchain.h
index fcc60b1fe001d1f34c64143d9a09d974409de667..49b0e66cefbd938feccf84d0f31176830236b584 100644
--- a/vulkan/vulkan_swapchain.h
+++ b/vulkan/vulkan_swapchain.h
@@ -9,9 +9,9 @@
 #include <utility>
 #include <vector>
 
+#include "flutter/fml/compiler_specific.h"
+#include "flutter/fml/macros.h"
 #include "flutter/vulkan/vulkan_handle.h"
-#include "lib/fxl/compiler_specific.h"
-#include "lib/fxl/macros.h"
 #include "third_party/skia/include/core/SkSize.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
@@ -56,7 +56,7 @@ class VulkanSwapchain {
 
   /// Submit a previously acquired. There must not be consecutive calls to
   /// |Submit| without and interleaving |AcquireFrame|.
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool Submit();
 
   SkISize GetSize() const;
@@ -89,7 +89,7 @@ class VulkanSwapchain {
 
   VulkanBackbuffer* GetNextBackbuffer();
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(VulkanSwapchain);
+  FML_DISALLOW_COPY_AND_ASSIGN(VulkanSwapchain);
 };
 
 }  // namespace vulkan
diff --git a/vulkan/vulkan_utilities.h b/vulkan/vulkan_utilities.h
index 19002e31629ad526a1fec158e253e5c8b15a3967..ab3d52b4cc20744c0da7629a38785499b83d29ad 100644
--- a/vulkan/vulkan_utilities.h
+++ b/vulkan/vulkan_utilities.h
@@ -8,9 +8,9 @@
 #include <string>
 #include <vector>
 
+#include "flutter/fml/macros.h"
 #include "flutter/vulkan/vulkan_handle.h"
 #include "flutter/vulkan/vulkan_proc_table.h"
-#include "lib/fxl/macros.h"
 
 namespace vulkan {
 
diff --git a/vulkan/vulkan_window.cc b/vulkan/vulkan_window.cc
index dc26140b5a889c488d591d25cc1d05a572a2391d..43a4f3b0006506edd0dd02bb22752ff3e7545195 100644
--- a/vulkan/vulkan_window.cc
+++ b/vulkan/vulkan_window.cc
@@ -16,16 +16,16 @@
 
 namespace vulkan {
 
-VulkanWindow::VulkanWindow(fxl::RefPtr<VulkanProcTable> proc_table,
+VulkanWindow::VulkanWindow(fml::RefPtr<VulkanProcTable> proc_table,
                            std::unique_ptr<VulkanNativeSurface> native_surface)
     : valid_(false), vk(std::move(proc_table)) {
   if (!vk || !vk->HasAcquiredMandatoryProcAddresses()) {
-    FXL_DLOG(INFO) << "Proc table has not acquired mandatory proc addresses.";
+    FML_DLOG(INFO) << "Proc table has not acquired mandatory proc addresses.";
     return;
   }
 
   if (native_surface == nullptr || !native_surface->IsValid()) {
-    FXL_DLOG(INFO) << "Native surface is invalid.";
+    FML_DLOG(INFO) << "Native surface is invalid.";
     return;
   }
 
@@ -42,7 +42,7 @@ VulkanWindow::VulkanWindow(fxl::RefPtr<VulkanProcTable> proc_table,
   if (!application_->IsValid() || !vk->AreInstanceProcsSetup()) {
     // Make certain the application instance was created and it setup the
     // instance proc table entries.
-    FXL_DLOG(INFO) << "Instance proc addresses have not been setup.";
+    FML_DLOG(INFO) << "Instance proc addresses have not been setup.";
     return;
   }
 
@@ -54,7 +54,7 @@ VulkanWindow::VulkanWindow(fxl::RefPtr<VulkanProcTable> proc_table,
       !vk->AreDeviceProcsSetup()) {
     // Make certain the device was created and it setup the device proc table
     // entries.
-    FXL_DLOG(INFO) << "Device proc addresses have not been setup.";
+    FML_DLOG(INFO) << "Device proc addresses have not been setup.";
     return;
   }
 
@@ -64,21 +64,21 @@ VulkanWindow::VulkanWindow(fxl::RefPtr<VulkanProcTable> proc_table,
                                              std::move(native_surface));
 
   if (!surface_->IsValid()) {
-    FXL_DLOG(INFO) << "Vulkan surface is invalid.";
+    FML_DLOG(INFO) << "Vulkan surface is invalid.";
     return;
   }
 
   // Create the Skia GrContext.
 
   if (!CreateSkiaGrContext()) {
-    FXL_DLOG(INFO) << "Could not create Skia context.";
+    FML_DLOG(INFO) << "Could not create Skia context.";
     return;
   }
 
   // Create the swapchain.
 
   if (!RecreateSwapchain()) {
-    FXL_DLOG(INFO) << "Could not setup the swapchain initially.";
+    FML_DLOG(INFO) << "Could not setup the swapchain initially.";
     return;
   }
 
@@ -144,7 +144,7 @@ bool VulkanWindow::CreateSkiaBackendContext(GrVkBackendContext* context) {
 
 sk_sp<SkSurface> VulkanWindow::AcquireSurface() {
   if (!IsValid()) {
-    FXL_DLOG(INFO) << "Surface is invalid.";
+    FML_DLOG(INFO) << "Surface is invalid.";
     return nullptr;
   }
 
@@ -158,10 +158,10 @@ sk_sp<SkSurface> VulkanWindow::AcquireSurface() {
   // size.
   if (surface_size != SkISize::Make(0, 0) &&
       surface_size != swapchain_->GetSize()) {
-    FXL_DLOG(INFO) << "Swapchain and surface sizes are out of sync. Recreating "
+    FML_DLOG(INFO) << "Swapchain and surface sizes are out of sync. Recreating "
                       "swapchain.";
     if (!RecreateSwapchain()) {
-      FXL_DLOG(INFO) << "Could not recreate swapchain.";
+      FML_DLOG(INFO) << "Could not recreate swapchain.";
       valid_ = false;
       return nullptr;
     }
@@ -180,7 +180,7 @@ sk_sp<SkSurface> VulkanWindow::AcquireSurface() {
 
     if (acquire_result == VulkanSwapchain::AcquireStatus::ErrorSurfaceLost) {
       // Surface is lost. This is an unrecoverable error.
-      FXL_DLOG(INFO) << "Swapchain reported surface was lost.";
+      FML_DLOG(INFO) << "Swapchain reported surface was lost.";
       return nullptr;
     }
 
@@ -192,7 +192,7 @@ sk_sp<SkSurface> VulkanWindow::AcquireSurface() {
         continue;
       } else {
         // Could not recreate the swapchain at the new configuration.
-        FXL_DLOG(INFO) << "Swapchain reported surface was out of date but "
+        FML_DLOG(INFO) << "Swapchain reported surface was out of date but "
                           "could not recreate the swapchain at the new "
                           "configuration.";
         valid_ = false;
@@ -203,13 +203,13 @@ sk_sp<SkSurface> VulkanWindow::AcquireSurface() {
     break;
   }
 
-  FXL_DCHECK(false) << "Unhandled VulkanSwapchain::AcquireResult";
+  FML_DCHECK(false) << "Unhandled VulkanSwapchain::AcquireResult";
   return nullptr;
 }
 
 bool VulkanWindow::SwapBuffers() {
   if (!IsValid()) {
-    FXL_DLOG(INFO) << "Window was invalid.";
+    FML_DLOG(INFO) << "Window was invalid.";
     return false;
   }
 
diff --git a/vulkan/vulkan_window.h b/vulkan/vulkan_window.h
index 55de23f2f7ff4828e10bd6f2a36196b37ea84343..b205762079c8a06cae36f7cde558e863d07d94c6 100644
--- a/vulkan/vulkan_window.h
+++ b/vulkan/vulkan_window.h
@@ -10,9 +10,9 @@
 #include <utility>
 #include <vector>
 
+#include "flutter/fml/compiler_specific.h"
+#include "flutter/fml/macros.h"
 #include "flutter/vulkan/vulkan_proc_table.h"
-#include "lib/fxl/compiler_specific.h"
-#include "lib/fxl/macros.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/core/SkSize.h"
 #include "third_party/skia/include/core/SkSurface.h"
@@ -31,7 +31,7 @@ class VulkanBackbuffer;
 
 class VulkanWindow {
  public:
-  VulkanWindow(fxl::RefPtr<VulkanProcTable> proc_table,
+  VulkanWindow(fml::RefPtr<VulkanProcTable> proc_table,
                std::unique_ptr<VulkanNativeSurface> native_surface);
 
   ~VulkanWindow();
@@ -46,7 +46,7 @@ class VulkanWindow {
 
  private:
   bool valid_;
-  fxl::RefPtr<VulkanProcTable> vk;
+  fml::RefPtr<VulkanProcTable> vk;
   std::unique_ptr<VulkanApplication> application_;
   std::unique_ptr<VulkanDevice> logical_device_;
   std::unique_ptr<VulkanSurface> surface_;
@@ -57,10 +57,10 @@ class VulkanWindow {
 
   bool CreateSkiaBackendContext(GrVkBackendContext* context);
 
-  FXL_WARN_UNUSED_RESULT
+  FML_WARN_UNUSED_RESULT
   bool RecreateSwapchain();
 
-  FXL_DISALLOW_COPY_AND_ASSIGN(VulkanWindow);
+  FML_DISALLOW_COPY_AND_ASSIGN(VulkanWindow);
 };
 
 }  // namespace vulkan