Sync: Do not generate non-UTF8 names for delete directives.

chrome/browser/history/delete_directive_handler.cc

 // Copyright (c) 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 "chrome/browser/history/delete_directive_handler.h"
 
 #include "base/json/json_writer.h"
 #include "base/rand_util.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_db_task.h"
 #include "chrome/browser/history/history_service.h"
 #include "sync/api/sync_change.h"
 #include "sync/protocol/history_delete_directive_specifics.pb.h"
 #include "sync/protocol/proto_value_conversions.h"
 #include "sync/protocol/sync.pb.h"
 
 namespace {
 
+std::string RandASCIIString(size_t length) {
+  std::string result;
+  const int kMin = static_cast<int>(' ');
+  const int kMax = static_cast<int>('~');
+  for (size_t i = 0; i < length; ++i)
+    result.push_back(static_cast<char>(base::RandInt(kMin, kMax)));
+  return result;
+}
+
 std::string DeleteDirectiveToString(
     const sync_pb::HistoryDeleteDirectiveSpecifics& delete_directive) {
   scoped_ptr<base::DictionaryValue> value(
       syncer::HistoryDeleteDirectiveSpecificsToValue(delete_directive));
   std::string str;
   base::JSONWriter::Write(value.get(), &str);
   return str;
 }
 
 // Compare time range directives first by start time, then by end time.
@@ skipping 316 matching lines @@
         syncer::SyncError::DATATYPE_ERROR,
         "Cannot send local delete directive to sync",
         syncer::HISTORY_DELETE_DIRECTIVES);
   }
 #if !defined(NDEBUG)
   CheckDeleteDirectiveValid(delete_directive);
 #endif
 
   // Generate a random sync tag since history delete directives don't
   // have a 'built-in' ID.  8 bytes should suffice.
-  std::string sync_tag = base::RandBytesAsString(8);
+  std::string sync_tag = RandASCIIString(8);
   sync_pb::EntitySpecifics entity_specifics;
   entity_specifics.mutable_history_delete_directive()->CopyFrom(
       delete_directive);
   syncer::SyncData sync_data =
       syncer::SyncData::CreateLocalData(
           sync_tag, sync_tag, entity_specifics);
   syncer::SyncChange change(
       FROM_HERE, syncer::SyncChange::ACTION_ADD, sync_data);
   syncer::SyncChangeList changes(1, change);
   return sync_processor_->ProcessSyncChanges(FROM_HERE, changes);
@@ skipping 52 matching lines @@
     for (size_t i = 0; i < delete_directives.size(); ++i) {
       change_list.push_back(
           syncer::SyncChange(FROM_HERE, syncer::SyncChange::ACTION_DELETE,
                              delete_directives[i]));
     }
     sync_processor_->ProcessSyncChanges(FROM_HERE, change_list);
   }
 }
 
 }  // namespace history