Revert 193777 "url: Changes to make it build standalone."

trunk/src/url/url_canon_stdstring.h

 // Copyright 2007, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // This header file defines a canonicalizer output method class for STL
 // strings. Because the canonicalizer tries not to be dependent on the STL,
 // we have segregated it here.
 
-#ifndef URL_URL_CANON_STDSTRING_H_
-#define URL_URL_CANON_STDSTRING_H_
+#ifndef GOOGLEURL_SRC_URL_CANON_STDSTRING_H__
+#define GOOGLEURL_SRC_URL_CANON_STDSTRING_H__
 
 #include <string>
-
-#include "base/compiler_specific.h"
-#include "url/url_canon.h"
-#include "url/url_common.h"
+#include "googleurl/src/url_canon.h"
 
 namespace url_canon {
 
 // Write into a std::string given in the constructor. This object does not own
 // the string itself, and the user must ensure that the string stays alive
 // throughout the lifetime of this object.
 //
 // The given string will be appended to; any existing data in the string will
 // be preserved. The caller should reserve() the amount of data in the string
 // they expect to be written. We will resize if necessary, but that's slow.
 //
 // Note that when canonicalization is complete, the string will likely have
 // unused space at the end because we make the string very big to start out
 // with (by |initial_size|). This ends up being important because resize
 // operations are slow, and because the base class needs to write directly
 // into the buffer.
 //
 // Therefore, the user should call Complete() before using the string that
 // this class wrote into.
-class GURL_API StdStringCanonOutput : public CanonOutput {
+class StdStringCanonOutput : public CanonOutput {
  public:
   StdStringCanonOutput(std::string* str)
       : CanonOutput(),
         str_(str) {
     cur_len_ = static_cast<int>(str_->size());  // Append to existing data.
     str_->resize(str_->capacity());
     buffer_ = str_->empty() ? NULL : &(*str_)[0];
     buffer_len_ = static_cast<int>(str_->size());
   }
   virtual ~StdStringCanonOutput() {
     // Nothing to do, we don't own the string.
   }
 
   // Must be called after writing has completed but before the string is used.
   void Complete() {
     str_->resize(cur_len_);
     buffer_len_ = cur_len_;
   }
 
-  virtual void Resize(int sz) OVERRIDE;
+  virtual void Resize(int sz) {
+    str_->resize(sz);
+    buffer_ = str_->empty() ? NULL : &(*str_)[0];
+    buffer_len_ = sz;
+  }
 
  protected:
   std::string* str_;
 };
 
 // An extension of the Replacements class that allows the setters to use
 // standard strings.
 //
 // The strings passed as arguments are not copied and must remain valid until
 // this class goes out of scope.
@@ skipping 30 matching lines @@
                    url_parse::Component(0, static_cast<int>(s.length())));
   }
   void SetRefStr(const STR& s) {
     this->SetRef(s.data(),
                  url_parse::Component(0, static_cast<int>(s.length())));
   }
 };
 
 }  // namespace url_canon
 
-#endif  // URL_URL_CANON_STDSTRING_H_
+#endif  // GOOGLEURL_SRC_URL_CANON_STDSTRING_H__
+