TelemetryLogWriter cleanups

remoting/base/telemetry_log_writer_unittest.cc

Index: remoting/base/telemetry_log_writer_unittest.cc
diff --git a/remoting/signaling/telemetry_log_writer_unittest.cc b/remoting/base/telemetry_log_writer_unittest.cc
similarity index 88%
rename from remoting/signaling/telemetry_log_writer_unittest.cc
rename to remoting/base/telemetry_log_writer_unittest.cc
index d9bcbddd2800e6e7d700faa619aa7f03893be521..2f6986617bc292f4b05d397dccf926e5a36f6a3a 100644
--- a/remoting/signaling/telemetry_log_writer_unittest.cc
+++ b/remoting/base/telemetry_log_writer_unittest.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/signaling/telemetry_log_writer.h"
+#include "remoting/base/telemetry_log_writer.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "net/http/http_status_code.h"
+#include "remoting/base/chromoting_event.h"
 #include "remoting/base/url_request.h"
-#include "remoting/signaling/chromoting_event.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
@@ -170,7 +170,7 @@ TEST_F(TelemetryLogWriterTest, PostOneLogFailedResendWithTwoPendingLogs) {
   LogFakeEvent();
 
   auto respond2 = request_factory_->AddExpectedRequest(
-      "{\"event\":[{\"id\":1},{\"id\":2},{\"id\":0}]}", success_result_);
+      "{\"event\":[{\"id\":0},{\"id\":1},{\"id\":2}]}", success_result_);
   LogFakeEvent();
   LogFakeEvent();
 
@@ -178,6 +178,29 @@ TEST_F(TelemetryLogWriterTest, PostOneLogFailedResendWithTwoPendingLogs) {
   respond2.Run();
 }
 
+TEST_F(TelemetryLogWriterTest, PostThreeLogsFailedAndResendWithOnePending) {
+  // This tests the ordering of the resent log.
+  auto respond1 = request_factory_->AddExpectedRequest(
+      "{\"event\":[{\"id\":0}]}", UrlRequest::Result::Failed());
+  LogFakeEvent();
+
+  auto respond2 = request_factory_->AddExpectedRequest(
+      "{\"event\":[{\"id\":0},{\"id\":1},{\"id\":2}]}",
+      UrlRequest::Result::Failed());
+  LogFakeEvent();
+  LogFakeEvent();
+
+  respond1.Run();
+
+  auto respond3 = request_factory_->AddExpectedRequest(
+      "{\"event\":[{\"id\":0},{\"id\":1},{\"id\":2},{\"id\":3}]}",
+      success_result_);
+  LogFakeEvent();
+
+  respond2.Run();
+  respond3.Run();
+}
+
 TEST_F(TelemetryLogWriterTest, PostOneUnauthorizedCallClosureAndRetry) {
   SetAuthClosure();