Don't drop debug_info when posting to sync server fails

sync/engine/download_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/engine/download.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "sync/engine/sync_directory_update_handler.h"
 #include "sync/internal_api/public/base/model_type_test_util.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/sessions/debug_info_getter.h"
 #include "sync/sessions/nudge_tracker.h"
 #include "sync/sessions/status_controller.h"
 #include "sync/syncable/directory.h"
 #include "sync/test/engine/test_directory_setter_upper.h"
+#include "sync/test/sessions/mock_debug_info_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
+using sessions::MockDebugInfoGetter;
+
 // A test fixture for tests exercising download updates functions.
 class DownloadUpdatesTest : public ::testing::Test {
  protected:
   DownloadUpdatesTest()
       : update_handler_map_deleter_(&update_handler_map_) {
   }
 
   virtual void SetUp() {
     dir_maker_.SetUp();
 
@@ skipping 163 matching lines @@
 
   ModelTypeSet progress_types;
   for (int i = 0; i < gu_msg.from_progress_marker_size(); ++i) {
     syncer::ModelType type = GetModelTypeFromSpecificsFieldNumber(
         gu_msg.from_progress_marker(i).data_type_id());
     progress_types.Put(type);
   }
   EXPECT_TRUE(proto_request_types().Equals(progress_types));
 }
 
-class MockDebugInfoGetter : public sessions::DebugInfoGetter {
- public:
-  MockDebugInfoGetter() {}
-  virtual ~MockDebugInfoGetter() {}
-
-  virtual void GetAndClearDebugInfo(sync_pb::DebugInfo* debug_info) OVERRIDE {
-    debug_info->CopyFrom(debug_info_);
-    debug_info_.Clear();
-  }
-
-  void AddDebugEvent() {
-    debug_info_.add_events();
-  }
-
- private:
-  sync_pb::DebugInfo debug_info_;
-};
-
 class DownloadUpdatesDebugInfoTest : public ::testing::Test {
  public:
   DownloadUpdatesDebugInfoTest() {}
   virtual ~DownloadUpdatesDebugInfoTest() {}
 
   sessions::StatusController* status() {
     return &status_;
   }
 
   sessions::DebugInfoGetter* debug_info_getter() {
     return &debug_info_getter_;
   }
 
   void AddDebugEvent() {
     debug_info_getter_.AddDebugEvent();
   }
 
  private:
   sessions::StatusController status_;
   MockDebugInfoGetter debug_info_getter_;
 };
 
 
-// Verify AppendDebugInfo when there are no events to upload.
-TEST_F(DownloadUpdatesDebugInfoTest, VerifyAppendDebugInfo_Empty) {
+// Verify CopyClientDebugInfo when there are no events to upload.
+TEST_F(DownloadUpdatesDebugInfoTest, VerifyCopyClientDebugInfo_Empty) {
   sync_pb::DebugInfo debug_info;
-  download::AppendClientDebugInfoIfNeeded(debug_info_getter(),
-                                          status(),
-                                          &debug_info);
+  download::CopyClientDebugInfo(debug_info_getter(), &debug_info);
   EXPECT_EQ(0, debug_info.events_size());
 }
 
-// We should upload debug info only once per sync cycle.
-TEST_F(DownloadUpdatesDebugInfoTest, TryDoubleAppend) {
-  sync_pb::DebugInfo debug_info1;
-
+TEST_F(DownloadUpdatesDebugInfoTest, VerifyCopyOverwrites) {
+  sync_pb::DebugInfo debug_info;
   AddDebugEvent();
-  download::AppendClientDebugInfoIfNeeded(debug_info_getter(),
-                                          status(),
-                                          &debug_info1);
-  EXPECT_EQ(1, debug_info1.events_size());
-
-
-  // Repeated invocations should not send up more events.
-  AddDebugEvent();
-  sync_pb::DebugInfo debug_info2;
-  download::AppendClientDebugInfoIfNeeded(debug_info_getter(),
-                                          status(),
-                                          &debug_info2);
-  EXPECT_EQ(0, debug_info2.events_size());
+  download::CopyClientDebugInfo(debug_info_getter(), &debug_info);
+  EXPECT_EQ(1, debug_info.events_size());
+  download::CopyClientDebugInfo(debug_info_getter(), &debug_info);
+  EXPECT_EQ(1, debug_info.events_size());
 }
 
 }  // namespace syncer