minidump: Use the crashpad::internal namespace more appropriately

minidump/minidump_string_writer.h

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 108 matching lines @@
 
   //! \brief Retrieves the string to be written.
   //!
   //! \note Valid in any state.
   const std::string& UTF8() const { return string(); }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MinidumpUTF8StringWriter);
 };
 
-//! \cond
-
-struct MinidumpStringListWriterUTF16Traits {
-  using MinidumpStringWriterType = MinidumpUTF16StringWriter;
-};
-
-struct MinidumpStringListWriterUTF8Traits {
-  using MinidumpStringWriterType = MinidumpUTF8StringWriter;
-};
-
-//! \endcond
-
 //! \brief The writer for a MinidumpRVAList object in a minidump file,
-//!     containing a list of \a Traits::MinidumpStringWriterType objects.
-template <typename Traits>
-class MinidumpStringListWriter : public MinidumpRVAListWriter {
+//!     containing a list of \a MinidumpStringWriterType objects.
+template <typename MinidumpStringWriterType>
+class MinidumpStringListWriter final : public MinidumpRVAListWriter {
  public:
-  using MinidumpStringWriterType = typename Traits::MinidumpStringWriterType;
-
   MinidumpStringListWriter();
   ~MinidumpStringListWriter() override;
 
   //! \brief Adds a new \a Traits::MinidumpStringWriterType for each element in
   //!     \a vector to the MinidumpRVAList.
   //!
   //! \param[in] vector The vector to use as source data. Each string in the
   //!     vector is treated as a UTF-8 string, and a new string writer will be
   //!     created for each one and made a child of the MinidumpStringListWriter.
   //!
   //! \note Valid in #kStateMutable. No mutator methods may be called before
   //!     this method, and it is not normally necessary to call any mutator
   //!     methods after this method.
   void InitializeFromVector(const std::vector<std::string>& vector);
 
   //! \brief Creates a new \a Traits::MinidumpStringWriterType object and adds
   //!     it to the MinidumpRVAList.
   //!
   //! This object creates a new string writer with string value \a string_utf8,
   //! takes ownership of it, and becomes its parent in the overall tree of
-  //! internal::MinidumpWritable objects.
+  //! MinidumpWritable objects.
   //!
   //! \note Valid in #kStateMutable.
   void AddStringUTF8(const std::string& string_utf8);
 
   //! \brief Determines whether the object is useful.
   //!
   //! A useful object is one that carries data that makes a meaningful
   //! contribution to a minidump file. An object carrying entries would be
   //! considered useful.
   //!
   //! \return `true` if the object is useful, `false` otherwise.
   bool IsUseful() const;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MinidumpStringListWriter);
 };
 
-using MinidumpUTF16StringListWriter =
-    MinidumpStringListWriter<MinidumpStringListWriterUTF16Traits>;
-using MinidumpUTF8StringListWriter =
-    MinidumpStringListWriter<MinidumpStringListWriterUTF8Traits>;
+}  // namespace internal
 
-}  // namespace internal
+using MinidumpUTF16StringListWriter = internal::MinidumpStringListWriter<
+    internal::MinidumpUTF16StringWriter>;
+using MinidumpUTF8StringListWriter = internal::MinidumpStringListWriter<
+    internal::MinidumpUTF8StringWriter>;
+
 }  // namespace crashpad
 
 #endif  // CRASHPAD_MINIDUMP_MINIDUMP_STRING_WRITER_H_