Fix remaining ftl->fxl conversions (flutter#4091)

* Fix remaining ftl->fxl conversions

The previous scripting pass at this did not account for objective c file endings

* Update tonic DEPS reference to the post-fxl version

BUILD.gn

@@ -45,7 +45,7 @@ group("flutter") {
       "//flutter/synchronization:synchronization_unittests",
       "//flutter/third_party/txt:txt_benchmarks",
       "//flutter/third_party/txt:txt_unittests",
-      "//garnet/public/lib/ftl:ftl_unittests",
+      "//garnet/public/lib/fxl:fxl_unittests",
     ]
   }
 }

DEPS

@@ -125,7 +125,7 @@ deps = {
    Var('fuchsia_git') + '/garnet' + '@' + '954225c071a8e44e83e9b0da4d3972771a5ed03a',
 
   'src/lib/tonic':
-   Var('fuchsia_git') + '/tonic' + '@' + 'fca532244483192e961cb826d9d0c05947cf288c',
+   Var('fuchsia_git') + '/tonic' + '@' + 'ce1c9992ddefb940f549e6a9f94252ef2963dd2e',
 
   'src/third_party/benchmark':
    Var('fuchsia_git') + '/third_party/benchmark' + '@' + '296537bc48d380adf21567c5d736ab79f5363d22',

assets/BUILD.gn

@@ -14,7 +14,7 @@ source_set("assets") {
 
   deps = [
     "//flutter/glue",
-    "//garnet/public/lib/ftl",
+    "//garnet/public/lib/fxl",
     "//garnet/public/lib/zip",
   ]
 

common/BUILD.gn

@@ -17,7 +17,7 @@ source_set("common") {
   ]
 
   deps = [
-    "//garnet/public/lib/ftl",
+    "//garnet/public/lib/fxl",
   ]
 
   public_configs = [ ":flutter_config" ]

fml/BUILD.gn

@@ -25,7 +25,7 @@ source_set("fml") {
 
   deps = [
     "//dart/runtime:dart_api",
-    "//garnet/public/lib/ftl",
+    "//garnet/public/lib/fxl",
 
     # These need to be in sync with the Fuchsia buildroot.
     "//third_party/icu",
@@ -113,6 +113,6 @@ executable("fml_unittests") {
     "//dart/runtime:libdart_jit",
     "//flutter/fml",
     "//flutter/testing",
-    "//garnet/public/lib/ftl",
+    "//garnet/public/lib/fxl",
   ]
 }

fml/platform/darwin/message_loop_darwin.mm

@@ -13,7 +13,7 @@
 
 MessageLoopDarwin::MessageLoopDarwin()
     : running_(false), loop_((CFRunLoopRef)CFRetain(CFRunLoopGetCurrent())) {
-  FTL_DCHECK(loop_ != nullptr);
+  FXL_DCHECK(loop_ != nullptr);
 
   // Setup the delayed wake source.
   CFRunLoopTimerContext timer_context = {
@@ -25,7 +25,7 @@
                            reinterpret_cast<CFRunLoopTimerCallBack>(&MessageLoopDarwin::OnTimerFire)
                            /* callout */,
                            &timer_context /* context */));
-  FTL_DCHECK(delayed_wake_timer_ != nullptr);
+  FXL_DCHECK(delayed_wake_timer_ != nullptr);
   CFRunLoopAddTimer(loop_, delayed_wake_timer_, kCFRunLoopCommonModes);
 }
 
@@ -35,7 +35,7 @@
 }
 
 void MessageLoopDarwin::Run() {
-  FTL_DCHECK(loop_ == CFRunLoopGetCurrent());
+  FXL_DCHECK(loop_ == CFRunLoopGetCurrent());
 
   running_ = true;
 
@@ -59,12 +59,12 @@
   CFRunLoopStop(loop_);
 }
 
-void MessageLoopDarwin::WakeUp(ftl::TimePoint time_point) {
-  // Rearm the timer. The time bases used by CoreFoundation and FTL are
+void MessageLoopDarwin::WakeUp(fxl::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 - ftl::TimePoint::Now()).ToSecondsF());
+      CFAbsoluteTimeGetCurrent() + (time_point - fxl::TimePoint::Now()).ToSecondsF());
 }
 
 void MessageLoopDarwin::OnTimerFire(CFRunLoopTimerRef timer, MessageLoopDarwin* loop) {

fml/platform/darwin/paths_darwin.mm

@@ -6,7 +6,7 @@
 
 #include <Foundation/Foundation.h>
 
-#include "lib/ftl/files/path.h"
+#include "lib/fxl/files/path.h"
 
 namespace fml {
 namespace paths {

glue/BUILD.gn

@@ -9,7 +9,7 @@ source_set("glue") {
   ]
 
   deps = [
-    "//garnet/public/lib/ftl",
+    "//garnet/public/lib/fxl",
   ]
 
   if (is_fuchsia) {

lib/io/BUILD.gn

@@ -11,7 +11,7 @@ source_set("io") {
   deps = [
     "//dart/runtime:dart_api",
     "//dart/runtime/bin:embedded_dart_io",
-    "//garnet/public/lib/ftl",
+    "//garnet/public/lib/fxl",
     "//lib/tonic/converter",
   ]
 }

runtime/BUILD.gn

@@ -79,7 +79,7 @@ source_set("runtime") {
     "//flutter/lib/io",
     "//flutter/lib/ui",
     "//flutter/sky/engine/platform",
-    "//garnet/public/lib/ftl",
+    "//garnet/public/lib/fxl",
     "//lib/tonic",
     "//third_party/rapidjson",
     "//third_party/skia",

shell/common/BUILD.gn

@@ -113,7 +113,7 @@ source_set("common") {
     "//flutter/sky/engine/wtf",
     "//flutter/synchronization",
     "//flutter/third_party/txt",
-    "//garnet/public/lib/ftl",
+    "//garnet/public/lib/fxl",
     "//lib/tonic",
     "//third_party/rapidjson",
     "//third_party/skia",

shell/gpu/BUILD.gn

@@ -27,7 +27,7 @@ source_set("gpu") {
     "//flutter/glue",
     "//flutter/shell/common",
     "//flutter/synchronization",
-    "//garnet/public/lib/ftl",
+    "//garnet/public/lib/fxl",
     "//third_party/skia",
     "//third_party/skia:gpu",
   ]

shell/platform/android/BUILD.gn

@@ -44,7 +44,7 @@ shared_library("flutter_shell_native") {
     "//flutter/runtime",
     "//flutter/shell/common",
     "//flutter/shell/gpu",
-    "//garnet/public/lib/ftl",
+    "//garnet/public/lib/fxl",
     "//third_party/skia",
   ]
   if (flutter_runtime_mode == "debug") {

shell/platform/darwin/BUILD.gn

@@ -47,7 +47,7 @@ source_set("flutter_channels") {
     "//flutter/shell/gpu",
     "//flutter/shell/testing",
     "//flutter/sky/engine/wtf",
-    "//garnet/public/lib/ftl",
+    "//garnet/public/lib/fxl",
     "//third_party/skia",
   ]
 }

shell/platform/darwin/common/BUILD.gn

@@ -26,7 +26,7 @@ source_set("common") {
     "//flutter/shell/gpu",
     "//flutter/shell/testing",
     "//flutter/sky/engine/wtf",
-    "//garnet/public/lib/ftl",
+    "//garnet/public/lib/fxl",
     "//third_party/skia",
   ]
 }

shell/platform/darwin/common/platform_mac.mm

@@ -14,19 +14,19 @@
 #include "flutter/shell/common/switches.h"
 #include "flutter/shell/common/tracing_controller.h"
 #include "flutter/sky/engine/wtf/MakeUnique.h"
-#include "lib/ftl/command_line.h"
-#include "lib/ftl/strings/string_view.h"
+#include "lib/fxl/command_line.h"
+#include "lib/fxl/strings/string_view.h"
 
 namespace shell {
 
-static ftl::CommandLine InitializedCommandLine() {
+static fxl::CommandLine InitializedCommandLine() {
   std::vector<std::string> args_vector;
 
   for (NSString* arg in [NSProcessInfo processInfo].arguments) {
     args_vector.emplace_back(arg.UTF8String);
   }
 
-  return ftl::CommandLineFromIterators(args_vector.begin(), args_vector.end());
+  return fxl::CommandLineFromIterators(args_vector.begin(), args_vector.end());
 }
 
 class EmbedderState {
@@ -37,7 +37,7 @@
     // See https://github.com/flutter/flutter/issues/4006
     blink::engine_main_enter_ts = Dart_TimelineGetMicros();
 #endif
-    FTL_DCHECK([NSThread isMainThread])
+    FXL_DCHECK([NSThread isMainThread])
         << "Embedder initialization must occur on the main platform thread";
 
     auto command_line = InitializedCommandLine();
@@ -52,7 +52,7 @@
   ~EmbedderState() {}
 
  private:
-  FTL_DISALLOW_COPY_AND_ASSIGN(EmbedderState);
+  FXL_DISALLOW_COPY_AND_ASSIGN(EmbedderState);
 };
 
 void PlatformMacMain(std::string icu_data_path, std::string application_library_path) {
@@ -92,7 +92,7 @@ static bool FlagsValidForCommandLineLaunch(const std::string& bundle_path,
   return true;
 }
 
-static std::string ResolveCommandLineLaunchFlag(const ftl::StringView name) {
+static std::string ResolveCommandLineLaunchFlag(const fxl::StringView name) {
   const auto& command_line = shell::Shell::Shared().GetCommandLine();
 
   std::string command_line_option;

shell/platform/darwin/desktop/BUILD.gn

@@ -30,7 +30,7 @@ source_set("mac_desktop_platform") {
     "//flutter/shell/platform/darwin/common",
     "//flutter/shell/testing",
     "//flutter/synchronization",
-    "//garnet/public/lib/ftl",
+    "//garnet/public/lib/fxl",
     "//third_party/skia",
   ]
 }

shell/platform/darwin/desktop/platform_view_mac.mm

@@ -14,8 +14,8 @@
 #include "flutter/shell/platform/darwin/common/platform_mac.h"
 #include "flutter/shell/platform/darwin/common/process_info_mac.h"
 #include "flutter/shell/platform/darwin/desktop/vsync_waiter_mac.h"
-#include "lib/ftl/command_line.h"
-#include "lib/ftl/synchronization/waitable_event.h"
+#include "lib/fxl/command_line.h"
+#include "lib/fxl/synchronization/waitable_event.h"
 
 namespace shell {
 
@@ -146,7 +146,7 @@
 void PlatformViewMac::RunFromSource(const std::string& assets_directory,
                                     const std::string& main,
                                     const std::string& packages) {
-  auto latch = new ftl::ManualResetWaitableEvent();
+  auto latch = new fxl::ManualResetWaitableEvent();
 
   dispatch_async(dispatch_get_main_queue(), ^{
     SetupAndLoadFromSource(assets_directory, main, packages);

shell/platform/darwin/ios/BUILD.gn

@@ -75,7 +75,7 @@ shared_library("flutter_framework_dylib") {
     "//flutter/shell/platform/darwin/common",
     "//flutter/sky/engine/platform",
     "//flutter/sky/engine/wtf",
-    "//garnet/public/lib/ftl",
+    "//garnet/public/lib/fxl",
     "//third_party/skia",
   ]
   if (flutter_runtime_mode == "debug") {

shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm

@@ -4,7 +4,7 @@
 
 #include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h"
 #include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
-#include "lib/ftl/logging.h"
+#include "lib/fxl/logging.h"
 
 @interface FlutterAppDelegate ()
 @property(readonly, nonatomic) NSMutableArray* pluginDelegates;
@@ -74,7 +74,7 @@ - (void)applicationDidEnterBackground:(UIApplication*)application {
   _debugBackgroundTask = [application
       beginBackgroundTaskWithName:@"Flutter debug task"
                 expirationHandler:^{
-                  FTL_LOG(WARNING)
+                  FXL_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"

shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm

@@ -10,9 +10,9 @@
 #include "flutter/shell/common/switches.h"
 #include "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartSource.h"
 #include "flutter/shell/platform/darwin/ios/framework/Source/flutter_main_ios.h"
-#include "lib/ftl/strings/string_view.h"
+#include "lib/fxl/strings/string_view.h"
 
-static NSURL* URLForSwitch(const ftl::StringView name) {
+static NSURL* URLForSwitch(const fxl::StringView name) {
   const auto& cmd = shell::Shell::Shared().GetCommandLine();
   NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
 

shell/platform/darwin/ios/framework/Source/FlutterView.mm

@@ -9,7 +9,7 @@
 #include "flutter/flow/layers/layer_tree.h"
 #include "flutter/shell/common/rasterizer.h"
 #include "flutter/shell/common/shell.h"
-#include "lib/ftl/synchronization/waitable_event.h"
+#include "lib/fxl/synchronization/waitable_event.h"
 #include "third_party/skia/include/utils/mac/SkCGUtils.h"
 
 @interface FlutterView ()<UIInputViewAudioFeedback>
@@ -43,7 +43,7 @@ - (BOOL)enableInputClicksWhenVisible {
   return YES;
 }
 
-void SnapshotRasterizer(ftl::WeakPtr<shell::Rasterizer> rasterizer,
+void SnapshotRasterizer(fxl::WeakPtr<shell::Rasterizer> rasterizer,
                         CGContextRef context,
                         bool is_opaque) {
   if (!rasterizer) {
@@ -94,7 +94,7 @@ void SnapshotContents(CGContextRef context, bool is_opaque) {
   // platform view. So use that. Once we support multiple platform views, the
   // shell will need to provide a way to get the rasterizer for a specific
   // platform view.
-  std::vector<ftl::WeakPtr<shell::Rasterizer>> registered_rasterizers;
+  std::vector<fxl::WeakPtr<shell::Rasterizer>> registered_rasterizers;
   shell::Shell::Shared().GetRasterizers(&registered_rasterizers);
   for (auto& rasterizer : registered_rasterizers) {
     SnapshotRasterizer(rasterizer, context, is_opaque);
@@ -108,7 +108,7 @@ void SnapshotContentsSync(CGContextRef context, UIView* view) {
     return;
   }
 
-  ftl::AutoResetWaitableEvent latch;
+  fxl::AutoResetWaitableEvent latch;
   gpu_thread->PostTask([&latch, context, view]() {
     SnapshotContents(context, [view isOpaque]);
     latch.Signal();