url: Build it as a static library.

This is temporary just to avoid weird link issues in Windows XP.

- Update the gyp file.
- Rename the gyp file from googleurl.gyp to url.gyp, so it matches the directory
name.
- Update the header include paths.
- Update the header include guards.
- Rename the target name from googleurl to url and googleurl_unittests to
url_unittests.
- Remove GURL_API (this will be replaced by URL_EXPORT when we componentize it again).
- Remove url_common.h (will be replaced by url_export.h when we componentize it again).

BUG=229660
TEST=url_unittests
R=brettw@chromium.org

Review URL: https://codereview.chromium.org/13998025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195005 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 10 deletions

diff --git a/url/url_canon_icu.h b/url/url_canon_icu.h
index e529fcb..3984fa2 100644
--- a/url/url_canon_icu.h
+++ b/url/url_canon_icu.h
@@ -27,12 +27,12 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// ICU integration functions.
+#ifndef URL_URL_CANON_ICU_H_
+#define URL_URL_CANON_ICU_H_
 
-#ifndef GOOGLEURL_SRC_URL_CANON_ICU_H__
-#define GOOGLEURL_SRC_URL_CANON_ICU_H__
+// ICU integration functions.
 
-#include "googleurl/src/url_canon.h"
+#include "url/url_canon.h"
 
 typedef struct UConverter UConverter;
 
@@ -45,13 +45,13 @@ class ICUCharsetConverter : public CharsetConverter {
   // Constructs a converter using an already-existing ICU character set
   // converter. This converter is NOT owned by this object; the lifetime must
   // be managed by the creator such that it is alive as long as this is.
-  GURL_API ICUCharsetConverter(UConverter* converter);
+  ICUCharsetConverter(UConverter* converter);
 
-  GURL_API virtual ~ICUCharsetConverter();
+  virtual ~ICUCharsetConverter();
 
-  GURL_API virtual void ConvertFromUTF16(const char16* input,
-                                         int input_len,
-                                         CanonOutput* output);
+  virtual void ConvertFromUTF16(const char16* input,
+                                int input_len,
+                                CanonOutput* output);
 
  private:
   // The ICU converter, not owned by this class.
@@ -60,4 +60,4 @@ class ICUCharsetConverter : public CharsetConverter {
 
 }  // namespace url_canon
 
-#endif  // GOOGLEURL_SRC_URL_CANON_ICU_H__
+#endif  // URL_URL_CANON_ICU_H_