Move libxml_utils from chrome/common to third_party/libxml/chromium.

third_party/libxml/chromium/include/libxml/libxml_utils.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
-#ifndef CHROME_COMMON_LIBXML_UTILS_H__
-#define CHROME_COMMON_LIBXML_UTILS_H__
+#ifndef __XML_LIBXML_UTILS_H__

[jam, 2012/05/04 06:36:35]

nit: this should be THIRD_PARTY_LIBXML_CHROMIUM_INCLUDE_LIBXML_LIBXML_UTILS_H_

[dtu, 2012/05/07 22:59:11]

Done.

+#define __XML_LIBXML_UTILS_H__
 #pragma once
 
 #include <string>
 
 #include "libxml/xmlreader.h"
 #include "libxml/xmlwriter.h"
 
-class FilePath;
-
 // Converts a libxml xmlChar* into a UTF-8 std::string.
 // NULL inputs produce an empty string.
 std::string XmlStringToStdString(const xmlChar* xmlstring);
 
 // libxml uses a global error function pointer for reporting errors.
 // A ScopedXmlErrorFunc object lets you change the global error pointer
 // for the duration of the object's lifetime.
 class ScopedXmlErrorFunc {
  public:
   ScopedXmlErrorFunc(void* context, xmlGenericErrorFunc func) {
@@ skipping 16 matching lines @@
  public:
   XmlReader();
   ~XmlReader();
 
   // Load a document into the reader from memory.  |input| must be UTF-8 and
   // exist for the lifetime of this object.  Returns false on error.
   // TODO(evanm): handle encodings other than UTF-8?
   bool Load(const std::string& input);
 
   // Load a document into the reader from a file.  Returns false on error.
-  bool LoadFile(const FilePath& file_path);
+  bool LoadFile(const std::string& file_path);
 
   // Wrappers around libxml functions -----------------------------------------
 
   // Read() advances to the next node.  Returns false on EOF or error.
   bool Read() { return xmlTextReaderRead(reader_) == 1; }
 
   // Next(), when pointing at an opening tag, advances to the node after
   // the matching closing tag.  Returns false on EOF or error.
   bool Next() { return xmlTextReaderNext(reader_) == 1; }
 
@@ skipping 20 matching lines @@
   // With the reader currently at (1), this returns the text of (2),
   // and advances past (3).
   // Returns false on error.
   bool ReadElementContent(std::string* content);
 
   // Skip to the next opening tag, returning false if we reach a closing
   // tag or EOF first.
   // If currently on an opening tag, doesn't advance at all.
   bool SkipToElement();
 
-  // Returns the errors reported by libxml, if any.
-  // (libxml normally just dumps these errors to stderr.)
-  const std::string& errors() const { return errors_; }
-
  private:
-  // A callback for libxml to report errors.
-  static void GenericErrorCallback(void* context, const char* msg, ...);
-
   // Returns the libxml node type of the current node.
   int NodeType() { return xmlTextReaderNodeType(reader_); }
 
   // The underlying libxml xmlTextReader.
   xmlTextReaderPtr reader_;
-
-  // error_func_ is used to reassign libxml's global error function
-  // to report errors into |errors_| for the lifetime of this object.
-  ScopedXmlErrorFunc error_func_;
-  std::string errors_;
 };
 
 // XmlWriter is a wrapper class around libxml's xmlWriter,
 // providing a simplified C++ API.
 // StartWriting must be called before other methods, and StopWriting
 // must be called before GetWrittenString() will return results.
 class XmlWriter {
  public:
   XmlWriter();
   ~XmlWriter();
@@ skipping 54 matching lines @@
   }
 
  private:
   // The underlying libxml xmlTextWriter.
   xmlTextWriterPtr writer_;
 
   // Stores the output.
   xmlBufferPtr buffer_;
 };
 
-#endif  // CHROME_COMMON_LIBXML_UTILS_H__
+#endif  // __XML_LIBXML_UTILS_H__
+