Address review comments

coryan · coryan · commit a6f80dcd6de3 · 2022-07-07T14:37:15.000Z
diff --git a/google/cloud/pubsub/integration_tests/subscriber_integration_test.cc b/google/cloud/pubsub/integration_tests/subscriber_integration_test.cc
@@ -457,8 +457,7 @@ TEST_F(SubscriberIntegrationTest, PublishOrdered) {
 
 TEST_F(SubscriberIntegrationTest, UnifiedCredentials) {
   auto options =
-      google::cloud::Options{}.set<google::cloud::UnifiedCredentialsOption>(
-          google::cloud::MakeGoogleDefaultCredentials());
+      Options{}.set<UnifiedCredentialsOption>(MakeGoogleDefaultCredentials());
   auto const using_emulator =
       internal::GetEnv("PUBSUB_EMULATOR_HOST").has_value();
   if (using_emulator) {
@@ -473,18 +472,9 @@ TEST_F(SubscriberIntegrationTest, UnifiedCredentials) {
 }
 
 TEST_F(SubscriberIntegrationTest, ExactlyOnce) {
-  auto options = Options{}.set<google::cloud::UnifiedCredentialsOption>(
-      MakeGoogleDefaultCredentials());
-  auto const using_emulator =
-      internal::GetEnv("PUBSUB_EMULATOR_HOST").has_value();
-  if (using_emulator) {
-    options = Options{}
-                  .set<UnifiedCredentialsOption>(MakeInsecureCredentials())
-                  .set<internal::UseInsecureChannelOption>(true);
-  }
-  auto publisher = Publisher(MakePublisherConnection(topic_, options));
+  auto publisher = Publisher(MakePublisherConnection(topic_));
   auto subscriber =
-      Subscriber(MakeSubscriberConnection(exactly_once_subscription_, options));
+      Subscriber(MakeSubscriberConnection(exactly_once_subscription_));
 
   std::mutex mu;
   std::map<std::string, int> ids;
diff --git a/google/cloud/pubsub/subscriber_connection.h b/google/cloud/pubsub/subscriber_connection.h
@@ -75,7 +75,7 @@ class SubscriberConnection {
    * `Subscriber::Subscribe(ExactlyOnceApplicationCallback)`.
    *
    * We use a different name for this function (as opposed to an overload) to
-   * simplify the use is mocks.
+   * simplify the use of mocks.
    */
   virtual future<Status> ExactlyOnceSubscribe(ExactlyOnceSubscribeParams p);
 };

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ class SubscriberConnection {`
`75`	`75`	* `Subscriber::Subscribe(ExactlyOnceApplicationCallback)`.
`76`	`76`	`*`
`77`	`77`	`* We use a different name for this function (as opposed to an overload) to`
`78`		`- * simplify the use is mocks.`
	`78`	`+ * simplify the use of mocks.`
`79`	`79`	`*/`
`80`	`80`	`virtual future<Status> ExactlyOnceSubscribe(ExactlyOnceSubscribeParams p);`
`81`	`81`	`};`