fix tests to use Options

Author: mpeddada1

google/cloud/storage/oauth2/service_account_credentials_test.cc

@@ -19,6 +19,7 @@
 #include "google/cloud/storage/testing/mock_http_request.h"
 #include "google/cloud/storage/testing/write_base64.h"
 #include "google/cloud/common_options.h"
+#include "google/cloud/credentials.h"
 #include "google/cloud/internal/base64_transforms.h"
 #include "google/cloud/internal/filesystem.h"
 #include "google/cloud/internal/random.h"
@@ -390,7 +391,7 @@ TEST_F(ServiceAccountCredentialsTest, UsesCARootsInfo) {
       });
 
   ServiceAccountCredentials<MockHttpRequestBuilder, FakeClock> credentials(
-      *info, ChannelOptions().set_ssl_root_path(cainfo));
+      *info, Options{}.set<google::cloud::CARootsFilePathOption>(cainfo));
   // Call Refresh to obtain the access token for our authorization header.
   auto authorization_header = credentials.AuthorizationHeader();
   ASSERT_STATUS_OK(authorization_header);

google/cloud/storage/tests/create_client_integration_test.cc

@@ -66,10 +66,9 @@ class CreateClientIntegrationTest
 #include "google/cloud/internal/disable_deprecation_warnings.inc"
 
 TEST_F(CreateClientIntegrationTest, DefaultWorks) {
-  auto client = Client::CreateDefaultClient();
-  ASSERT_THAT(client, IsOk());
+  auto client = Client(Options{});
   ASSERT_NO_FATAL_FAILURE(
-      UseClient(*client, bucket_name(), MakeRandomObjectName(), LoremIpsum()));
+      UseClient(client, bucket_name(), MakeRandomObjectName(), LoremIpsum()));
 }
 
 TEST_F(CreateClientIntegrationTest, SettingPolicies) {
@@ -79,24 +78,20 @@ TEST_F(CreateClientIntegrationTest, SettingPolicies) {
     ASSERT_THAT(c, IsOk());
     credentials = *std::move(c);
   }
-  auto client =
-      Client(Options{}),
-             LimitedErrorCountRetryPolicy(/*maximum_failures=*/5),
-             ExponentialBackoffPolicy(/*initial_delay=*/std::chrono::seconds(1),
-                                      /*maximum_delay=*/std::chrono::minutes(5),
-                                      /*scaling=*/1.5));
+  auto client = Client(
+      Options{}
+          .set<RetryPolicyOption>(
+              LimitedErrorCountRetryPolicy(/*maximum_failures=*/5).clone())
+          .set<BackoffPolicyOption>(
+              ExponentialBackoffPolicy(
+                  /*initial_delay=*/std::chrono::seconds(1),
+                  /*maximum_delay=*/std::chrono::minutes(5),
+                  /*scaling=*/1.5)
+                  .clone()));
   ASSERT_NO_FATAL_FAILURE(
       UseClient(client, bucket_name(), MakeRandomObjectName(), LoremIpsum()));
 }
 
-/// @test Verify the backwards compatibility `v1` namespace still exists.
-TEST_F(CreateClientIntegrationTest, BackwardsCompatibility) {
-  auto client = Client(Options{});
-  ASSERT_THAT(client, IsOk());
-  ASSERT_NO_FATAL_FAILURE(
-      UseClient(*client, bucket_name(), MakeRandomObjectName(), LoremIpsum()));
-}
-
 }  // namespace
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace storage