cleanup(storage): inline UndecoratedFromMock() (#11708)

googleapis · May 23, 2023 · 64aae9e · 64aae9e
1 parent 43ed8e2
commit 64aae9e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 32 deletions.
diff --git a/google/cloud/storage/google_cloud_cpp_storage.cmake b/google/cloud/storage/google_cloud_cpp_storage.cmake
@@ -406,7 +406,6 @@ if (BUILD_TESTING)
         testing/client_unit_test.cc
         testing/client_unit_test.h
         testing/constants.h
-        testing/mock_client.cc
         testing/mock_client.h
         testing/mock_http_request.cc
         testing/mock_http_request.h

diff --git a/google/cloud/storage/storage_client_testing.bzl b/google/cloud/storage/storage_client_testing.bzl
@@ -35,7 +35,6 @@ storage_client_testing_hdrs = [
 
 storage_client_testing_srcs = [
     "testing/client_unit_test.cc",
-    "testing/mock_client.cc",
     "testing/mock_http_request.cc",
     "testing/object_integration_test.cc",
     "testing/random_names.cc",

diff --git a/google/cloud/storage/testing/mock_client.cc b/google/cloud/storage/testing/mock_client.cc
diff --git a/google/cloud/storage/testing/mock_client.h b/google/cloud/storage/testing/mock_client.h
@@ -203,7 +203,9 @@ Client ClientFromMock(std::shared_ptr<MockClient> const& mock,
  *
  * This client does not retry on transient errors.
  */
-Client UndecoratedClientFromMock(std::shared_ptr<MockClient> mock);
+inline Client UndecoratedClientFromMock(std::shared_ptr<MockClient> mock) {
+  return internal::ClientImplDetails::CreateWithoutDecorations(std::move(mock));
+}
 
 }  // namespace testing
 }  // namespace storage