2 files changed, 17 insertions, 7 deletions
diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc
index 92b9fe7..383c7ef 100644
--- a/chrome/browser/task_manager/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager/task_manager_resource_providers.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 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.
 
@@ -113,11 +113,7 @@ TaskManagerRendererResource::TaskManagerRendererResource(
   // We cache the process and pid as when a Tab/BackgroundContents is closed the
   // process reference becomes NULL and the TaskManager still needs it.
   pid_ = base::GetProcId(process_);
-  stats_.images.size = 0;
-  stats_.cssStyleSheets.size = 0;
-  stats_.scripts.size = 0;
-  stats_.xslStyleSheets.size = 0;
-  stats_.fonts.size = 0;
+  memset(&stats_, 0, sizeof(stats_));
 }
 
 TaskManagerRendererResource::~TaskManagerRendererResource() {
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();
+}
+
+}