additional clean up

Author: mpeddada1

google/cloud/storage/client.h

@@ -3603,20 +3603,8 @@ struct ClientImplDetails {
   // NOLINTNEXTLINE(performance-unnecessary-value-param)
   static Client CreateClient(std::shared_ptr<StorageConnection> c,
                              Policies&&... p) {
-    struct ApplyPoliciesHelper {
-      Options& opts;
-      void operator()(RetryPolicy const& p) {
-        opts.set<RetryPolicyOption>(p.clone());
-      }
-      void operator()(BackoffPolicy const& p) {
-        opts.set<BackoffPolicyOption>(p.clone());
-      }
-      void operator()(IdempotencyPolicy const& p) {
-        opts.set<IdempotencyPolicyOption>(p.clone());
-      }
-    };
-    auto opts = c->options();
-    (ApplyPoliciesHelper{opts}(std::forward<Policies>(p)), ...);
+    auto opts =
+        internal::ApplyPolicies(c->options(), std::forward<Policies>(p)...);
     return CreateWithDecorations(opts, std::move(c));
   }
 };

google/cloud/storage/tests/object_media_integration_test.cc

@@ -515,9 +515,6 @@ TEST_F(ObjectMediaIntegrationTest, ConnectionFailureUploadFile) {
 TEST_F(ObjectMediaIntegrationTest, StreamingReadTimeout) {
   // The emulator does not support this type of fault injection for gRPC.
   if (!UsingEmulator() || UsingGrpc()) GTEST_SKIP();
-  // auto options = internal::DefaultOptions();
-  // ASSERT_STATUS_OK(options);
-
   auto client = MakeIntegrationTestClient(
       Options{}
           .set<TransferStallTimeoutOption>(std::chrono::seconds(3))