Enforce clang-format on web/cas and web/http_client

Bug: b/512215781

Author: Databean

base/cvd/cuttlefish/host/libs/web/cas/BUILD.bazel

@@ -8,7 +8,6 @@ cf_cc_library(
     name = "cas_downloader",
     srcs = ["cas_downloader.cpp"],
     hdrs = ["cas_downloader.h"],
-    clang_format_enabled = False,
     deps = [
         "//cuttlefish/common/libs/fs",
         "//cuttlefish/common/libs/utils:environment",

base/cvd/cuttlefish/host/libs/web/cas/cas_downloader.cpp

@@ -28,12 +28,12 @@
 #include <utility>
 #include <vector>
 
-#include <android-base/expected.h>
-#include "absl/strings/str_join.h"
-#include <json/value.h>
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
+#include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
+#include "android-base/expected.h"
+#include "json/value.h"
 
 #include "cuttlefish/common/libs/utils/files.h"
 #include "cuttlefish/common/libs/utils/json.h"
@@ -44,7 +44,6 @@
 #include "cuttlefish/result/result.h"
 
 namespace cuttlefish {
-
 namespace {
 
 std::set<std::string> GetSupportedFlags(const std::string& go_binary_path) {

base/cvd/cuttlefish/host/libs/web/cas/cas_downloader.h

@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 
-#include <json/value.h>
+#include "json/value.h"
 
 #include "cuttlefish/host/libs/web/android_build.h"
 #include "cuttlefish/host/libs/web/cas/cas_flags.h"

base/cvd/cuttlefish/host/libs/web/cas/cas_flags.cc

@@ -61,9 +61,8 @@ CasDownloaderFlags::CasDownloaderFlags()
 std::vector<Flag> CasDownloaderFlags::Flags() {
   std::vector<Flag> flags;
 
-  flags.emplace_back(
-      cas_config_filepath.Flag("cas_config_filepath")
-          .Help("Path to the CAS downloader config file."));
+  flags.emplace_back(cas_config_filepath.Flag("cas_config_filepath")
+                         .Help("Path to the CAS downloader config file."));
   flags.emplace_back(
       downloader_path.Flag("cas_downloader_path")
           .Help("Path to the CAS downloader binary. Enables CAS downloading if "
@@ -105,10 +104,9 @@ std::vector<Flag> CasDownloaderFlags::Flags() {
       get_capabilities_timeout.Flag("cas_get_capabilities_timeout")
           .Help("RPC timeout for GetCapabilities in seconds (casdownloader "
                 "flag: get-capabilities-timeout)."));
-  flags.emplace_back(
-      get_tree_timeout.Flag("cas_get_tree_timeout")
-          .Help("RPC timeout for GetTree in seconds "
-                "(casdownloader flag: get-tree-timeout)."));
+  flags.emplace_back(get_tree_timeout.Flag("cas_get_tree_timeout")
+                         .Help("RPC timeout for GetTree in seconds "
+                               "(casdownloader flag: get-tree-timeout)."));
   flags.emplace_back(
       batch_read_blobs_timeout.Flag("cas_batch_read_blobs_timeout")
           .Help("RPC timeout for BatchReadBlobs in seconds (casdownloader "
@@ -118,9 +116,8 @@ std::vector<Flag> CasDownloaderFlags::Flags() {
           .Help("RPC timeout for BatchUpdateBlobs in seconds (casdownloader "
                 "flag: batch-update-blobs-timeout)."));
   flags.emplace_back(
-      version.Flag("version")
-          .Help("Print CAS downloader version information "
-                "(casdownloader flag: version)."));
+      version.Flag("version").Help("Print CAS downloader version information "
+                                   "(casdownloader flag: version)."));
 
   return flags;
 }

base/cvd/cuttlefish/host/libs/web/cas/cas_flags.h

@@ -40,9 +40,7 @@ class FlagValue {
  private:
   friend struct CasDownloaderFlags;
 
-  Flag Flag(const std::string& name) {
-      return GflagsCompatFlag(name, value_);
-  }
+  Flag Flag(const std::string& name) { return GflagsCompatFlag(name, value_); }
 
   std::optional<T> value_;
   T default_value_;

base/cvd/cuttlefish/host/libs/web/http_client/BUILD.bazel

@@ -15,7 +15,6 @@ cf_cc_library(
     name = "curl_http_client",
     srcs = ["curl_http_client.cc"],
     hdrs = ["curl_http_client.h"],
-    clang_format_enabled = False,
     deps = [
         "//cuttlefish/host/libs/web/http_client",
         "//cuttlefish/host/libs/web/http_client:scrub_secrets",

base/cvd/cuttlefish/host/libs/web/http_client/curl_http_client.cc

@@ -17,10 +17,6 @@
 
 #include <stdio.h>
 
-#include <curl/curl.h>
-#include <curl/easy.h>
-#include <curl/header.h>
-
 #include <functional>
 #include <memory>
 #include <mutex>
@@ -29,8 +25,11 @@
 #include <utility>
 #include <vector>
 
-#include "absl/strings/ascii.h"
 #include "absl/log/log.h"
+#include "absl/strings/ascii.h"
+#include "curl/curl.h"
+#include "curl/easy.h"
+#include "curl/header.h"
 
 #include "cuttlefish/host/libs/web/http_client/http_client.h"
 #include "cuttlefish/host/libs/web/http_client/scrub_secrets.h"