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

url/url_canon_stdstring.h:65: error: undefined reference to 'vtable for url_canon::StdStringCanonOutput' > url: Changes to make it build standalone. > > - 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. > - Add missing OVERRIDEs where clang complains. > > BUG=229660 > TEST=url_unittests > R=brettw@chromium.org > > Review URL: https://codereview.chromium.org/14016005 TBR=tfarina@chromium.org Review URL: https://codereview.chromium.org/14264002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194155 0039d316-1c4b-4281-b951-d872f2087c98
dednal · Apr 15, 2013 · 2244f0a · 2244f0a
1 parent 0b7b7c2
commit 2244f0a
Show file tree

Hide file tree

Showing 38 changed files with 254 additions and 268 deletions.
diff --git a/url/googleurl.gyp b/url/googleurl.gyp
@@ -0,0 +1,109 @@
+# 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.
+
+# TODO(mark): Upstream this file to googleurl.
+{
+  'variables': {
+    'chromium_code': 1,
+  },
+  'targets': [
+    {
+      'target_name': 'googleurl',
+      'type': '<(component)',
+      'dependencies': [
+        '../../base/base.gyp:base',
+        '../../third_party/icu/icu.gyp:icudata',
+        '../../third_party/icu/icu.gyp:icui18n',
+        '../../third_party/icu/icu.gyp:icuuc',
+      ],
+      'sources': [
+        '../../googleurl/src/gurl.cc',
+        '../../googleurl/src/gurl.h',
+        '../../googleurl/src/url_canon.h',
+        '../../googleurl/src/url_canon_etc.cc',
+        '../../googleurl/src/url_canon_fileurl.cc',
+        '../../googleurl/src/url_canon_filesystemurl.cc',
+        '../../googleurl/src/url_canon_host.cc',
+        '../../googleurl/src/url_canon_icu.cc',
+        '../../googleurl/src/url_canon_icu.h',
+        '../../googleurl/src/url_canon_internal.cc',
+        '../../googleurl/src/url_canon_internal.h',
+        '../../googleurl/src/url_canon_internal_file.h',
+        '../../googleurl/src/url_canon_ip.cc',
+        '../../googleurl/src/url_canon_ip.h',
+        '../../googleurl/src/url_canon_mailtourl.cc',
+        '../../googleurl/src/url_canon_path.cc',
+        '../../googleurl/src/url_canon_pathurl.cc',
+        '../../googleurl/src/url_canon_query.cc',
+        '../../googleurl/src/url_canon_relative.cc',
+        '../../googleurl/src/url_canon_stdstring.h',
+        '../../googleurl/src/url_canon_stdurl.cc',
+        '../../googleurl/src/url_file.h',
+        '../../googleurl/src/url_parse.cc',
+        '../../googleurl/src/url_parse.h',
+        '../../googleurl/src/url_parse_file.cc',
+        '../../googleurl/src/url_parse_internal.h',
+        '../../googleurl/src/url_util.cc',
+        '../../googleurl/src/url_util.h',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../..',
+        ],
+      },
+      'defines': [
+        'FULL_FILESYSTEM_URL_SUPPORT=1',
+      ],
+      'conditions': [
+        ['component=="shared_library"', {
+          'defines': [
+            'GURL_DLL',
+            'GURL_IMPLEMENTATION=1',
+          ],
+          'direct_dependent_settings': {
+            'defines': [
+              'GURL_DLL',
+            ],
+          },
+        }],
+      ],
+      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+      'msvs_disabled_warnings': [4267, ],
+    },
+    {
+      'target_name': 'googleurl_unittests',
+      'type': 'executable',
+      'dependencies': [
+        'googleurl',
+        '../../base/base.gyp:base_i18n',
+        '../../base/base.gyp:run_all_unittests',
+        '../../testing/gtest.gyp:gtest',
+        '../../third_party/icu/icu.gyp:icuuc',
+      ],
+      'sources': [
+        '../../googleurl/src/gurl_unittest.cc',
+        '../../googleurl/src/url_canon_unittest.cc',
+        '../../googleurl/src/url_parse_unittest.cc',
+        '../../googleurl/src/url_test_utils.h',
+        '../../googleurl/src/url_util_unittest.cc',
+      ],
+      'defines': [
+        'FULL_FILESYSTEM_URL_SUPPORT=1',
+      ],
+      'conditions': [
+        ['os_posix==1 and OS!="mac" and OS!="ios"', {
+          'conditions': [
+            ['linux_use_tcmalloc==1', {
+              'dependencies': [
+                '../../base/allocator/allocator.gyp:allocator',
+              ],
+            }],
+          ],
+        }],
+      ],
+      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+      'msvs_disabled_warnings': [4267, ],
+    },
+  ],
+}
diff --git a/url/gurl.cc b/url/gurl.cc
@@ -27,8 +27,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "url/gurl.h"
-
 #ifdef WIN32
 #include <windows.h>
 #else
@@ -38,9 +36,11 @@
 #include <algorithm>
 #include <ostream>
 
+#include "googleurl/src/gurl.h"
+
 #include "base/logging.h"
-#include "url/url_canon_stdstring.h"
-#include "url/url_util.h"
+#include "googleurl/src/url_canon_stdstring.h"
+#include "googleurl/src/url_util.h"
 
 namespace {
 

diff --git a/url/gurl.h b/url/gurl.h
@@ -27,17 +27,17 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#ifndef URL_GURL_H_
-#define URL_GURL_H_
+#ifndef GOOGLEURL_SRC_GURL_H__
+#define GOOGLEURL_SRC_GURL_H__
 
 #include <iosfwd>
 #include <string>
 
 #include "base/string16.h"
-#include "url/url_canon.h"
-#include "url/url_canon_stdstring.h"
-#include "url/url_common.h"
-#include "url/url_parse.h"
+#include "googleurl/src/url_canon.h"
+#include "googleurl/src/url_canon_stdstring.h"
+#include "googleurl/src/url_common.h"
+#include "googleurl/src/url_parse.h"
 
 class GURL {
  public:
@@ -389,4 +389,4 @@ class GURL {
 // Stream operator so GURL can be used in assertion statements.
 GURL_API std::ostream& operator<<(std::ostream& out, const GURL& url);
 
-#endif  // URL_GURL_H_
+#endif  // GOOGLEURL_SRC_GURL_H__
diff --git a/url/gurl_unittest.cc b/url/gurl_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "googleurl/src/gurl.h"
+#include "googleurl/src/url_canon.h"
+#include "googleurl/src/url_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "url/gurl.h"
-#include "url/url_canon.h"
-#include "url/url_test_utils.h"
 
 // Some implementations of base/basictypes.h may define ARRAYSIZE.
 // If it's not defined, we define it to the ARRAYSIZE_UNSAFE macro

diff --git a/url/url.gyp b/url/url.gyp
diff --git a/url/url_canon.h b/url/url_canon.h
@@ -26,16 +26,15 @@
 // 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.
+#ifndef GOOGLEURL_SRC_URL_CANON_H__
+#define GOOGLEURL_SRC_URL_CANON_H__
 
-#ifndef URL_URL_CANON_H_
-#define URL_URL_CANON_H_
-
-#include <stdlib.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "base/string16.h"
-#include "url/url_common.h"
-#include "url/url_parse.h"
+#include "googleurl/src/url_common.h"
+#include "googleurl/src/url_parse.h"
 
 namespace url_canon {
 
@@ -910,4 +909,4 @@ GURL_API bool ResolveRelativeURL(const char* base_url,
 
 }  // namespace url_canon
 
-#endif  // URL_URL_CANON_H_
+#endif  // GOOGLEURL_SRC_URL_CANON_H__
diff --git a/url/url_canon_etc.cc b/url/url_canon_etc.cc
@@ -31,8 +31,8 @@
 
 #include <string.h>
 
-#include "url/url_canon.h"
-#include "url/url_canon_internal.h"
+#include "googleurl/src/url_canon.h"
+#include "googleurl/src/url_canon_internal.h"
 
 namespace url_canon {
 

diff --git a/url/url_canon_filesystemurl.cc b/url/url_canon_filesystemurl.cc
@@ -29,12 +29,12 @@
 
 // Functions for canonicalizing "filesystem:file:" URLs.
 
-#include "url/url_canon.h"
-#include "url/url_canon_internal.h"
-#include "url/url_file.h"
-#include "url/url_parse_internal.h"
-#include "url/url_util.h"
-#include "url/url_util_internal.h"
+#include "googleurl/src/url_canon.h"
+#include "googleurl/src/url_canon_internal.h"
+#include "googleurl/src/url_file.h"
+#include "googleurl/src/url_parse_internal.h"
+#include "googleurl/src/url_util.h"
+#include "googleurl/src/url_util_internal.h"
 
 namespace url_canon {
 

diff --git a/url/url_canon_fileurl.cc b/url/url_canon_fileurl.cc
@@ -29,10 +29,10 @@
 
 // Functions for canonicalizing "file:" URLs.
 
-#include "url/url_canon.h"
-#include "url/url_canon_internal.h"
-#include "url/url_file.h"
-#include "url/url_parse_internal.h"
+#include "googleurl/src/url_canon.h"
+#include "googleurl/src/url_canon_internal.h"
+#include "googleurl/src/url_file.h"
+#include "googleurl/src/url_parse_internal.h"
 
 namespace url_canon {
 

diff --git a/url/url_canon_host.cc b/url/url_canon_host.cc
@@ -28,8 +28,8 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "base/logging.h"
-#include "url/url_canon.h"
-#include "url/url_canon_internal.h"
+#include "googleurl/src/url_canon.h"
+#include "googleurl/src/url_canon_internal.h"
 
 namespace url_canon {
 

diff --git a/url/url_canon_icu.cc b/url/url_canon_icu.cc
@@ -35,9 +35,10 @@
 #include <unicode/ucnv_cb.h>
 #include <unicode/uidna.h>
 
+#include "googleurl/src/url_canon_icu.h"
+#include "googleurl/src/url_canon_internal.h"  // for _itoa_s
+
 #include "base/logging.h"
-#include "url/url_canon_icu.h"
-#include "url/url_canon_internal.h"  // for _itoa_s
 
 namespace url_canon {