summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
authorericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-18 20:06:35 +0000
committerericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-18 20:06:35 +0000
commit4309d07c11458bf356551575029554badd1308f7 (patch)
treed26b5224439f0bae97b0dbe119b6fd054793e339 /chrome/installer
parente871f1a0bdf9c09b2c72e521b179ebb2fd6dc4e9 (diff)
downloadchromium_src-4309d07c11458bf356551575029554badd1308f7.zip
chromium_src-4309d07c11458bf356551575029554badd1308f7.tar.gz
chromium_src-4309d07c11458bf356551575029554badd1308f7.tar.bz2
Roll deps for filesystem URL changes, take 3.
BUG=none TEST=existing googleurl unit tests continue to pass Review URL: https://chromiumcodereview.appspot.com/9104001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118128 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
-rw-r--r--chrome/installer/util/master_preferences_dummy.cc16
1 files changed, 15 insertions, 1 deletions
diff --git a/chrome/installer/util/master_preferences_dummy.cc b/chrome/installer/util/master_preferences_dummy.cc
index 4869ac6..3b89238 100644
--- a/chrome/installer/util/master_preferences_dummy.cc
+++ b/chrome/installer/util/master_preferences_dummy.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
//
@@ -56,3 +56,17 @@ const MasterPreferences& MasterPreferences::ForCurrentProcess() {
return prefs;
}
}
+
+// The use of std::vector<GURL>() above requires us to have a destructor for
+// GURL. GURL contains a member of type url_parse::Parsed, which declares (but
+// does not implement) an explicit destructor in its header file. We're missing
+// the real implementation by not depending on the googleurl library. However,
+// we don't really need it, so we just replace it here rather than building a
+// 64-bit version of the googleurl library with all its dependencies.
+namespace url_parse {
+
+Parsed::~Parsed() {
+ NOTREACHED();
+}
+
+}