[Courgette] Refactor BSDiff namespaces and bsdiff::search() interface.

courgette/third_party/bsdiff/bsdiff.h

 // Copyright 2003, 2004 Colin Percival
 // All rights reserved
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted providing that the following conditions
 // are met:
 // 1. Redistributions of source code must retain the above copyright
 //    notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright
 //    notice, this list of conditions and the following disclaimer in the
@@ skipping 29 matching lines @@
 // found in the LICENSE file.
 
 #ifndef COURGETTE_THIRD_PARTY_BSDIFF_BSDIFF_H_
 #define COURGETTE_THIRD_PARTY_BSDIFF_BSDIFF_H_
 
 #include <stdint.h>
 
 #include "base/files/file_util.h"
 
 namespace courgette {
+class SourceStream;
+class SinkStream;
+}  // namespace courgette
+
+namespace bsdiff {
 
 enum BSDiffStatus {
   OK = 0,
   MEM_ERROR = 1,
   CRC_ERROR = 2,
   READ_ERROR = 3,
   UNEXPECTED_ERROR = 4,
   WRITE_ERROR = 5
 };
 
-class SourceStream;
-class SinkStream;
-
 // Creates a binary patch.
 //
-BSDiffStatus CreateBinaryPatch(SourceStream* old_stream,
-                               SourceStream* new_stream,
-                               SinkStream* patch_stream);
+BSDiffStatus CreateBinaryPatch(courgette::SourceStream* old_stream,
+                               courgette::SourceStream* new_stream,
+                               courgette::SinkStream* patch_stream);
 
 // Applies the given patch file to a given source file. This method validates
 // the CRC of the original file stored in the patch file, before applying the
 // patch to it.
 //
-BSDiffStatus ApplyBinaryPatch(SourceStream* old_stream,
-                              SourceStream* patch_stream,
-                              SinkStream* new_stream);
+BSDiffStatus ApplyBinaryPatch(courgette::SourceStream* old_stream,
+                              courgette::SourceStream* patch_stream,
+                              courgette::SinkStream* new_stream);
 
 // As above, but simply takes the file paths.
 BSDiffStatus ApplyBinaryPatch(const base::FilePath& old_stream,
                               const base::FilePath& patch_stream,
                               const base::FilePath& new_stream);
 
 // The following declarations are common to the patch-creation and
 // patch-application code.
 
 // The patch stream starts with a MBSPatchHeader.
 typedef struct MBSPatchHeader_ {
   char tag[8];      // Contains MBS_PATCH_HEADER_TAG.
   uint32_t slen;    // Length of the file to be patched.
   uint32_t scrc32;  // CRC32 of the file to be patched.
   uint32_t dlen;    // Length of the result file.
 } MBSPatchHeader;
 
 // This is the value for the tag field.  Must match length exactly, not counting
 // null at end of string.
 #define MBS_PATCH_HEADER_TAG "GBSDIF42"
 
-}  // namespace
+}  // namespace bsdiff
+
 #endif  // COURGETTE_THIRD_PARTY_BSDIFF_BSDIFF_H_