remove includes

Author: scotthart

doc/v3-migration-guide.md

@@ -340,9 +340,9 @@ namespace gc = ::google::cloud;
 namespace pubsub = ::google::cloud::pubsub;
 
 auto options = gc::Options{}
-    .set<pubsub::MessagePrderingOption>(true)
+    .set<pubsub::MessageOrderingOption>(true)
     .set<pubsub::FullPublisherActionOption>(
-        pubsub::FullPublisherAction::kBlockIgnored);
+        pubsub::FullPublisherAction::kIgnored);
 
 auto publisher = pubsub::Publisher(pubsub::MakePublisherConnection(
     topic, options));
@@ -394,7 +394,7 @@ namespace gc = ::google::cloud;
 namespace pubsub = ::google::cloud::pubsub;
 
 auto options = gc::Options{}
-    .set<pubsub::MaxDeadlineTimeOption>(10)
+    .set<pubsub::MaxDeadlineTimeOption>(std::chrono::seconds(10))
     .set<pubsub::MaxOutstandingMessagesOption>(42);
 
 auto subscriber = pubsub::Subscriber(pubsub::MakeSubscriberConnection(

google/cloud/pubsub/blocking_publisher.h

@@ -16,7 +16,6 @@
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_PUBSUB_BLOCKING_PUBLISHER_H
 
 #include "google/cloud/pubsub/blocking_publisher_connection.h"
-#include "google/cloud/pubsub/publisher_options.h"
 #include "google/cloud/pubsub/version.h"
 #include <string>
 

google/cloud/pubsub/blocking_publisher_connection.h

@@ -19,7 +19,6 @@
 #include "google/cloud/pubsub/connection_options.h"
 #include "google/cloud/pubsub/internal/publisher_stub.h"
 #include "google/cloud/pubsub/message.h"
-#include "google/cloud/pubsub/publisher_options.h"
 #include "google/cloud/pubsub/retry_policy.h"
 #include "google/cloud/pubsub/topic.h"
 #include "google/cloud/pubsub/version.h"

google/cloud/pubsub/internal/streaming_subscription_batch_source.h

@@ -21,7 +21,6 @@
 #include "google/cloud/pubsub/internal/subscriber_stub.h"
 #include "google/cloud/pubsub/internal/subscription_batch_source.h"
 #include "google/cloud/pubsub/retry_policy.h"
-#include "google/cloud/pubsub/subscriber_options.h"
 #include "google/cloud/pubsub/version.h"
 #include "google/cloud/future.h"
 #include "google/cloud/status.h"

google/cloud/pubsub/publisher_connection.h

@@ -19,7 +19,6 @@
 #include "google/cloud/pubsub/connection_options.h"
 #include "google/cloud/pubsub/internal/publisher_stub.h"
 #include "google/cloud/pubsub/message.h"
-#include "google/cloud/pubsub/publisher_options.h"
 #include "google/cloud/pubsub/retry_policy.h"
 #include "google/cloud/pubsub/topic.h"
 #include "google/cloud/pubsub/version.h"

google/cloud/pubsub/subscriber_connection.h

@@ -22,7 +22,6 @@
 #include "google/cloud/pubsub/message.h"
 #include "google/cloud/pubsub/pull_response.h"
 #include "google/cloud/pubsub/retry_policy.h"
-#include "google/cloud/pubsub/subscriber_options.h"
 #include "google/cloud/pubsub/subscription.h"
 #include "google/cloud/pubsub/version.h"
 #include "google/cloud/internal/non_constructible.h"