refactor: Migrate away from grpc_utils namespace (#1266)

mr-salty · web-flow · commit eb9fa0386562 · 2020-02-14T12:44:04.000-05:00
* refactor: Migrate away from `grpc_utils` namespace

* qualify uses of `MakeStatusFromRpcError`
diff --git a/ci/test-api/spanner_client.expected.abi.dump.gz b/ci/test-api/spanner_client.expected.abi.dump.gz
diff --git a/google/cloud/spanner/BUILD b/google/cloud/spanner/BUILD
@@ -43,7 +43,7 @@ cc_library(
     ],
     deps = [
         "@com_github_googleapis_google_cloud_cpp_common//google/cloud:google_cloud_cpp_common",
-        "@com_github_googleapis_google_cloud_cpp_common//google/cloud/grpc_utils:google_cloud_cpp_grpc_utils",
+        "@com_github_googleapis_google_cloud_cpp_common//google/cloud:google_cloud_cpp_grpc_utils",
         "@com_google_googleapis//:spanner_protos",
     ],
 )
diff --git a/google/cloud/spanner/benchmarks/multiple_rows_cpu_benchmark.cc b/google/cloud/spanner/benchmarks/multiple_rows_cpu_benchmark.cc
@@ -18,7 +18,7 @@
 #include "google/cloud/spanner/internal/spanner_stub.h"
 #include "google/cloud/spanner/testing/pick_random_instance.h"
 #include "google/cloud/spanner/testing/random_database_name.h"
-#include "google/cloud/grpc_utils/grpc_error_delegate.h"
+#include "google/cloud/grpc_error_delegate.h"
 #include "google/cloud/internal/random.h"
 #include <google/spanner/v1/result_set.pb.h>
 #include <algorithm>
@@ -710,8 +710,7 @@ class ReadExperiment : public Experiment {
       timer.Stop();
       samples.push_back(RowCpuSample{
           client_count, thread_count, true, row_count, timer.elapsed_time(),
-          timer.cpu_time(),
-          google::cloud::grpc_utils::MakeStatusFromRpcError(final)});
+          timer.cpu_time(), google::cloud::MakeStatusFromRpcError(final)});
     }
     return samples;
   }
@@ -934,8 +933,7 @@ class SelectExperiment : public Experiment {
       timer.Stop();
       samples.push_back(RowCpuSample{
           client_count, thread_count, true, row_count, timer.elapsed_time(),
-          timer.cpu_time(),
-          google::cloud::grpc_utils::MakeStatusFromRpcError(final)});
+          timer.cpu_time(), google::cloud::MakeStatusFromRpcError(final)});
     }
     return samples;
   }
diff --git a/google/cloud/spanner/connection_options.cc b/google/cloud/spanner/connection_options.cc
@@ -82,7 +82,7 @@ grpc::ChannelArguments ConnectionOptions::CreateChannelArguments() const {
 }
 
 ConnectionOptions& ConnectionOptions::DisableBackgroundThreads(
-    google::cloud::grpc_utils::CompletionQueue const& cq) {
+    google::cloud::CompletionQueue const& cq) {
   background_threads_factory_ = [cq] {
     return google::cloud::internal::make_unique<
         google::cloud::internal::CustomerSuppliedBackgroundThreads>(cq);
diff --git a/google/cloud/spanner/connection_options.h b/google/cloud/spanner/connection_options.h
@@ -18,7 +18,7 @@
 #include "google/cloud/spanner/tracing_options.h"
 #include "google/cloud/spanner/version.h"
 #include "google/cloud/background_threads.h"
-#include "google/cloud/grpc_utils/completion_queue.h"
+#include "google/cloud/completion_queue.h"
 #include "google/cloud/status_or.h"
 #include <google/spanner/admin/database/v1/spanner_database_admin.grpc.pb.h>
 #include <google/spanner/v1/spanner.pb.h>
@@ -188,7 +188,7 @@ class ConnectionOptions {
    * `CompletionQueue::Run()`.
    */
   ConnectionOptions& DisableBackgroundThreads(
-      google::cloud::grpc_utils::CompletionQueue const& cq);
+      google::cloud::CompletionQueue const& cq);
 
   using BackgroundThreadsFactory =
       std::function<std::unique_ptr<BackgroundThreads>()>;
diff --git a/google/cloud/spanner/connection_options_test.cc b/google/cloud/spanner/connection_options_test.cc
@@ -170,7 +170,7 @@ TEST(ConnectionOptionsTest, CreateChannelArgumentsWithChannelPool) {
 }
 
 TEST(ConnectionOptionsTest, CustomBackgroundThreads) {
-  grpc_utils::CompletionQueue cq;
+  CompletionQueue cq;
 
   auto options = ConnectionOptions(grpc::InsecureChannelCredentials())
                      .DisableBackgroundThreads(cq);
diff --git a/google/cloud/spanner/database_admin_client.cc b/google/cloud/spanner/database_admin_client.cc
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include "google/cloud/spanner/database_admin_client.h"
-#include "google/cloud/grpc_utils/grpc_error_delegate.h"
 #include <algorithm>
 
 namespace google {
diff --git a/google/cloud/spanner/internal/connection_impl.cc b/google/cloud/spanner/internal/connection_impl.cc
@@ -20,7 +20,7 @@
 #include "google/cloud/spanner/internal/status_utils.h"
 #include "google/cloud/spanner/query_partition.h"
 #include "google/cloud/spanner/read_partition.h"
-#include "google/cloud/grpc_utils/grpc_error_delegate.h"
+#include "google/cloud/grpc_error_delegate.h"
 #include "google/cloud/internal/make_unique.h"
 #include <limits>
 
@@ -51,7 +51,7 @@ class DefaultPartialResultSetReader : public PartialResultSetReader {
   }
 
   Status Finish() override {
-    return grpc_utils::MakeStatusFromRpcError(reader_->Finish());
+    return google::cloud::MakeStatusFromRpcError(reader_->Finish());
   }
 
  private:
@@ -667,7 +667,7 @@ StatusOr<BatchDmlResult> ConnectionImpl::ExecuteBatchDmlImpl(
   }
 
   BatchDmlResult result;
-  result.status = grpc_utils::MakeStatusFromRpcError(response->status());
+  result.status = google::cloud::MakeStatusFromRpcError(response->status());
   for (auto const& result_set : response->result_sets()) {
     result.stats.push_back({result_set.stats().row_count_exact()});
   }
diff --git a/google/cloud/spanner/internal/database_admin_stub.cc b/google/cloud/spanner/internal/database_admin_stub.cc
@@ -15,7 +15,7 @@
 #include "google/cloud/spanner/internal/database_admin_stub.h"
 #include "google/cloud/spanner/internal/database_admin_logging.h"
 #include "google/cloud/spanner/internal/database_admin_metadata.h"
-#include "google/cloud/grpc_utils/grpc_error_delegate.h"
+#include "google/cloud/grpc_error_delegate.h"
 #include "google/cloud/log.h"
 #include <google/longrunning/operations.grpc.pb.h>
 
@@ -46,7 +46,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {
     grpc::Status status =
         database_admin_->CreateDatabase(&client_context, request, &response);
     if (!status.ok()) {
-      return google::cloud::grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
@@ -58,7 +58,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {
     auto status =
         database_admin_->GetDatabase(&client_context, request, &response);
     if (!status.ok()) {
-      return google::cloud::grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
@@ -70,7 +70,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {
     auto status =
         database_admin_->GetDatabaseDdl(&client_context, request, &response);
     if (!status.ok()) {
-      return google::cloud::grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
@@ -83,7 +83,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {
     grpc::Status status =
         database_admin_->UpdateDatabaseDdl(&context, request, &response);
     if (!status.ok()) {
-      return google::cloud::grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
@@ -94,7 +94,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {
     grpc::Status status =
         database_admin_->DropDatabase(&client_context, request, &response);
     if (!status.ok()) {
-      return google::cloud::grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return google::cloud::Status();
   }
@@ -106,7 +106,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {
     auto status =
         database_admin_->ListDatabases(&client_context, request, &response);
     if (!status.ok()) {
-      return google::cloud::grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
@@ -118,7 +118,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {
     auto status =
         database_admin_->GetIamPolicy(&client_context, request, &response);
     if (!status.ok()) {
-      return google::cloud::grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
@@ -130,7 +130,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {
     auto status =
         database_admin_->SetIamPolicy(&client_context, request, &response);
     if (!status.ok()) {
-      return google::cloud::grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
@@ -142,7 +142,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {
     auto status = database_admin_->TestIamPermissions(&client_context, request,
                                                       &response);
     if (!status.ok()) {
-      return google::cloud::grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
@@ -154,7 +154,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {
     grpc::Status status =
         operations_->GetOperation(&client_context, request, &response);
     if (!status.ok()) {
-      return google::cloud::grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
diff --git a/google/cloud/spanner/internal/instance_admin_stub.cc b/google/cloud/spanner/internal/instance_admin_stub.cc
@@ -15,7 +15,7 @@
 #include "google/cloud/spanner/internal/instance_admin_stub.h"
 #include "google/cloud/spanner/internal/instance_admin_logging.h"
 #include "google/cloud/spanner/internal/instance_admin_metadata.h"
-#include "google/cloud/grpc_utils/grpc_error_delegate.h"
+#include "google/cloud/grpc_error_delegate.h"
 #include "google/cloud/log.h"
 #include <google/longrunning/operations.grpc.pb.h>
 
@@ -46,7 +46,7 @@ class DefaultInstanceAdminStub : public InstanceAdminStub {
     gcsa::Instance response;
     auto status = instance_admin_->GetInstance(&context, request, &response);
     if (!status.ok()) {
-      return google::cloud::grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
@@ -58,7 +58,7 @@ class DefaultInstanceAdminStub : public InstanceAdminStub {
     grpc::Status status =
         instance_admin_->CreateInstance(&context, request, &response);
     if (!status.ok()) {
-      return google::cloud::grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
@@ -70,7 +70,7 @@ class DefaultInstanceAdminStub : public InstanceAdminStub {
     grpc::Status status =
         instance_admin_->UpdateInstance(&context, request, &response);
     if (!status.ok()) {
-      return google::cloud::grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
@@ -81,7 +81,7 @@ class DefaultInstanceAdminStub : public InstanceAdminStub {
     grpc::Status status =
         instance_admin_->DeleteInstance(&context, request, &response);
     if (!status.ok()) {
-      return google::cloud::grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return google::cloud::Status();
   }
@@ -93,7 +93,7 @@ class DefaultInstanceAdminStub : public InstanceAdminStub {
     auto status =
         instance_admin_->GetInstanceConfig(&context, request, &response);
     if (!status.ok()) {
-      return google::cloud::grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
@@ -105,7 +105,7 @@ class DefaultInstanceAdminStub : public InstanceAdminStub {
     auto status =
         instance_admin_->ListInstanceConfigs(&context, request, &response);
     if (!status.ok()) {
-      return google::cloud::grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
@@ -116,7 +116,7 @@ class DefaultInstanceAdminStub : public InstanceAdminStub {
     gcsa::ListInstancesResponse response;
     auto status = instance_admin_->ListInstances(&context, request, &response);
     if (!status.ok()) {
-      return grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
@@ -127,7 +127,7 @@ class DefaultInstanceAdminStub : public InstanceAdminStub {
     giam::Policy response;
     auto status = instance_admin_->GetIamPolicy(&context, request, &response);
     if (!status.ok()) {
-      return grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
@@ -138,7 +138,7 @@ class DefaultInstanceAdminStub : public InstanceAdminStub {
     giam::Policy response;
     auto status = instance_admin_->SetIamPolicy(&context, request, &response);
     if (!status.ok()) {
-      return grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
@@ -150,7 +150,7 @@ class DefaultInstanceAdminStub : public InstanceAdminStub {
     auto status =
         instance_admin_->TestIamPermissions(&context, request, &response);
     if (!status.ok()) {
-      return grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
@@ -162,7 +162,7 @@ class DefaultInstanceAdminStub : public InstanceAdminStub {
     grpc::Status status =
         operations_->GetOperation(&client_context, request, &response);
     if (!status.ok()) {
-      return google::cloud::grpc_utils::MakeStatusFromRpcError(status);
+      return google::cloud::MakeStatusFromRpcError(status);
     }
     return response;
   }
diff --git a/google/cloud/spanner/internal/polling_loop.h b/google/cloud/spanner/internal/polling_loop.h
@@ -16,7 +16,7 @@
 #define GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_INTERNAL_POLLING_LOOP_H
 
 #include "google/cloud/spanner/polling_policy.h"
-#include "google/cloud/grpc_utils/grpc_error_delegate.h"
+#include "google/cloud/grpc_error_delegate.h"
 #include "google/cloud/internal/invoke_result.h"
 #include "google/cloud/status_or.h"
 #include <google/longrunning/operations.pb.h>
@@ -141,9 +141,8 @@ typename ValueExtractor::ReturnType PollingLoopImpl(
   }
 
   if (operation.has_error()) {
-    // The long running operation failed, return the error to the
-    // caller.
-    return google::cloud::grpc_utils::MakeStatusFromRpcError(operation.error());
+    // The long running operation failed, return the error to the caller.
+    return google::cloud::MakeStatusFromRpcError(operation.error());
   }
   return ValueExtractor::Extract(operation, location);
 }
diff --git a/google/cloud/spanner/internal/session_pool.cc b/google/cloud/spanner/internal/session_pool.cc
@@ -16,8 +16,8 @@
 #include "google/cloud/spanner/internal/connection_impl.h"
 #include "google/cloud/spanner/internal/retry_loop.h"
 #include "google/cloud/spanner/internal/session.h"
-#include "google/cloud/grpc_utils/completion_queue.h"
-#include "google/cloud/internal/background_threads_impl.h"
+#include "google/cloud/background_threads.h"
+#include "google/cloud/completion_queue.h"
 #include "google/cloud/internal/make_unique.h"
 #include "google/cloud/log.h"
 #include "google/cloud/status.h"
diff --git a/google/cloud/spanner/internal/spanner_stub.cc b/google/cloud/spanner/internal/spanner_stub.cc

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ cc_library(`
`43`	`43`	`],`
`44`	`44`	`deps = [`
`45`	`45`	`"@com_github_googleapis_google_cloud_cpp_common//google/cloud:google_cloud_cpp_common",`
`46`		`- "@com_github_googleapis_google_cloud_cpp_common//google/cloud/grpc_utils:google_cloud_cpp_grpc_utils",`
	`46`	`+ "@com_github_googleapis_google_cloud_cpp_common//google/cloud:google_cloud_cpp_grpc_utils",`
`47`	`47`	`"@com_google_googleapis//:spanner_protos",`
`48`	`48`	`],`
`49`	`49`	`)`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ grpc::ChannelArguments ConnectionOptions::CreateChannelArguments() const {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`ConnectionOptions& ConnectionOptions::DisableBackgroundThreads(`
`85`		`- google::cloud::grpc_utils::CompletionQueue const& cq) {`
	`85`	`+ google::cloud::CompletionQueue const& cq) {`
`86`	`86`	`background_threads_factory_ = [cq] {`
`87`	`87`	`return google::cloud::internal::make_unique<`
`88`	`88`	`google::cloud::internal::CustomerSuppliedBackgroundThreads>(cq);`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ TEST(ConnectionOptionsTest, CreateChannelArgumentsWithChannelPool) {`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`TEST(ConnectionOptionsTest, CustomBackgroundThreads) {`
`173`		`- grpc_utils::CompletionQueue cq;`
	`173`	`+ CompletionQueue cq;`
`174`	`174`
`175`	`175`	`auto options = ConnectionOptions(grpc::InsecureChannelCredentials())`
`176`	`176`	`.DisableBackgroundThreads(cq);`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`#include "google/cloud/spanner/internal/status_utils.h"`
`21`	`21`	`#include "google/cloud/spanner/query_partition.h"`
`22`	`22`	`#include "google/cloud/spanner/read_partition.h"`
`23`		`-#include "google/cloud/grpc_utils/grpc_error_delegate.h"`
	`23`	`+#include "google/cloud/grpc_error_delegate.h"`
`24`	`24`	`#include "google/cloud/internal/make_unique.h"`
`25`	`25`	`#include <limits>`
`26`	`26`
`@@ -51,7 +51,7 @@ class DefaultPartialResultSetReader : public PartialResultSetReader {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`Status Finish() override {`
`54`		`- return grpc_utils::MakeStatusFromRpcError(reader_->Finish());`
	`54`	`+ return google::cloud::MakeStatusFromRpcError(reader_->Finish());`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`private:`
`@@ -667,7 +667,7 @@ StatusOr<BatchDmlResult> ConnectionImpl::ExecuteBatchDmlImpl(`
`667`	`667`	`}`
`668`	`668`
`669`	`669`	`BatchDmlResult result;`
`670`		`- result.status = grpc_utils::MakeStatusFromRpcError(response->status());`
	`670`	`+ result.status = google::cloud::MakeStatusFromRpcError(response->status());`
`671`	`671`	`for (auto const& result_set : response->result_sets()) {`
`672`	`672`	`result.stats.push_back({result_set.stats().row_count_exact()});`
`673`	`673`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`#include "google/cloud/spanner/internal/database_admin_stub.h"`
`16`	`16`	`#include "google/cloud/spanner/internal/database_admin_logging.h"`
`17`	`17`	`#include "google/cloud/spanner/internal/database_admin_metadata.h"`
`18`		`-#include "google/cloud/grpc_utils/grpc_error_delegate.h"`
	`18`	`+#include "google/cloud/grpc_error_delegate.h"`
`19`	`19`	`#include "google/cloud/log.h"`
`20`	`20`	`#include <google/longrunning/operations.grpc.pb.h>`
`21`	`21`
`@@ -46,7 +46,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {`
`46`	`46`	`grpc::Status status =`
`47`	`47`	`database_admin_->CreateDatabase(&client_context, request, &response);`
`48`	`48`	`if (!status.ok()) {`
`49`		`- return google::cloud::grpc_utils::MakeStatusFromRpcError(status);`
	`49`	`+ return google::cloud::MakeStatusFromRpcError(status);`
`50`	`50`	`}`
`51`	`51`	`return response;`
`52`	`52`	`}`
`@@ -58,7 +58,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {`
`58`	`58`	`auto status =`
`59`	`59`	`database_admin_->GetDatabase(&client_context, request, &response);`
`60`	`60`	`if (!status.ok()) {`
`61`		`- return google::cloud::grpc_utils::MakeStatusFromRpcError(status);`
	`61`	`+ return google::cloud::MakeStatusFromRpcError(status);`
`62`	`62`	`}`
`63`	`63`	`return response;`
`64`	`64`	`}`
`@@ -70,7 +70,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {`
`70`	`70`	`auto status =`
`71`	`71`	`database_admin_->GetDatabaseDdl(&client_context, request, &response);`
`72`	`72`	`if (!status.ok()) {`
`73`		`- return google::cloud::grpc_utils::MakeStatusFromRpcError(status);`
	`73`	`+ return google::cloud::MakeStatusFromRpcError(status);`
`74`	`74`	`}`
`75`	`75`	`return response;`
`76`	`76`	`}`
`@@ -83,7 +83,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {`
`83`	`83`	`grpc::Status status =`
`84`	`84`	`database_admin_->UpdateDatabaseDdl(&context, request, &response);`
`85`	`85`	`if (!status.ok()) {`
`86`		`- return google::cloud::grpc_utils::MakeStatusFromRpcError(status);`
	`86`	`+ return google::cloud::MakeStatusFromRpcError(status);`
`87`	`87`	`}`
`88`	`88`	`return response;`
`89`	`89`	`}`
`@@ -94,7 +94,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {`
`94`	`94`	`grpc::Status status =`
`95`	`95`	`database_admin_->DropDatabase(&client_context, request, &response);`
`96`	`96`	`if (!status.ok()) {`
`97`		`- return google::cloud::grpc_utils::MakeStatusFromRpcError(status);`
	`97`	`+ return google::cloud::MakeStatusFromRpcError(status);`
`98`	`98`	`}`
`99`	`99`	`return google::cloud::Status();`
`100`	`100`	`}`
`@@ -106,7 +106,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {`
`106`	`106`	`auto status =`
`107`	`107`	`database_admin_->ListDatabases(&client_context, request, &response);`
`108`	`108`	`if (!status.ok()) {`
`109`		`- return google::cloud::grpc_utils::MakeStatusFromRpcError(status);`
	`109`	`+ return google::cloud::MakeStatusFromRpcError(status);`
`110`	`110`	`}`
`111`	`111`	`return response;`
`112`	`112`	`}`
`@@ -118,7 +118,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {`
`118`	`118`	`auto status =`
`119`	`119`	`database_admin_->GetIamPolicy(&client_context, request, &response);`
`120`	`120`	`if (!status.ok()) {`
`121`		`- return google::cloud::grpc_utils::MakeStatusFromRpcError(status);`
	`121`	`+ return google::cloud::MakeStatusFromRpcError(status);`
`122`	`122`	`}`
`123`	`123`	`return response;`
`124`	`124`	`}`
`@@ -130,7 +130,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {`
`130`	`130`	`auto status =`
`131`	`131`	`database_admin_->SetIamPolicy(&client_context, request, &response);`
`132`	`132`	`if (!status.ok()) {`
`133`		`- return google::cloud::grpc_utils::MakeStatusFromRpcError(status);`
	`133`	`+ return google::cloud::MakeStatusFromRpcError(status);`
`134`	`134`	`}`
`135`	`135`	`return response;`
`136`	`136`	`}`
`@@ -142,7 +142,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {`
`142`	`142`	`auto status = database_admin_->TestIamPermissions(&client_context, request,`
`143`	`143`	`&response);`
`144`	`144`	`if (!status.ok()) {`
`145`		`- return google::cloud::grpc_utils::MakeStatusFromRpcError(status);`
	`145`	`+ return google::cloud::MakeStatusFromRpcError(status);`
`146`	`146`	`}`
`147`	`147`	`return response;`
`148`	`148`	`}`
`@@ -154,7 +154,7 @@ class DefaultDatabaseAdminStub : public DatabaseAdminStub {`
`154`	`154`	`grpc::Status status =`
`155`	`155`	`operations_->GetOperation(&client_context, request, &response);`
`156`	`156`	`if (!status.ok()) {`
`157`		`- return google::cloud::grpc_utils::MakeStatusFromRpcError(status);`
	`157`	`+ return google::cloud::MakeStatusFromRpcError(status);`
`158`	`158`	`}`
`159`	`159`	`return response;`
`160`	`160`	`}`