4 files changed, 3 insertions, 26 deletions
diff --git a/chrome/renderer/module_system_unittest.cc b/chrome/renderer/module_system_unittest.cc
index ff520ac..abe4780 100644
--- a/chrome/renderer/module_system_unittest.cc
+++ b/chrome/renderer/module_system_unittest.cc
@@ -38,6 +38,7 @@ class AssertNatives : public NativeHandler {
 class StringSourceMap : public ModuleSystem::SourceMap {
  public:
   StringSourceMap() {}
+  virtual ~StringSourceMap() {}
 
   v8::Handle<v8::Value> GetSource(const std::string& name) OVERRIDE {
     if (source_map_.count(name) == 0)
@@ -83,7 +84,7 @@ class ModuleSystemTest : public testing::Test {
         source_map_(new StringSourceMap()) {
     context_->Enter();
     assert_natives_ = new AssertNatives();
-    module_system_.reset(new ModuleSystem(source_map_));
+    module_system_.reset(new ModuleSystem(source_map_.get()));
     module_system_->RegisterNativeHandler("assert", scoped_ptr<NativeHandler>(
         assert_natives_));
     RegisterModule("add", "exports.Add = function(x, y) { return x + y; };");
@@ -109,7 +110,7 @@ class ModuleSystemTest : public testing::Test {
   v8::HandleScope handle_scope_;
   v8::TryCatch try_catch_;
   AssertNatives* assert_natives_;
-  StringSourceMap* source_map_;
+  scoped_ptr<StringSourceMap> source_map_;
   scoped_ptr<ModuleSystem> module_system_;
 };
 
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index 6103ec7..c0284e5 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -1735,13 +1735,6 @@
    fun:BookmarkEditorGtkTest_*_Test::TestBody
 }
 {
-   bug_115296
-   Heapcheck:Leak
-   fun:::GetResource
-   fun:ModuleSystem::EnsureRequireLoaded
-   fun:ModuleSystem::Require
-}
-{
    bug_115611_a
    Heapcheck:Leak
    fun:base::Bind
@@ -1878,9 +1871,3 @@
    ...
    fun:SelectFileDialogExtensionTest_SelfDeleting_Test::TestBody
 }
-{
-   bug_118575
-   Heapcheck:Leak
-   ...
-   fun:ModuleSystemTest*
-}
diff --git a/tools/valgrind/drmemory/suppressions_full.txt b/tools/valgrind/drmemory/suppressions_full.txt
index b1d5ed9..c9bec3f 100644
--- a/tools/valgrind/drmemory/suppressions_full.txt
+++ b/tools/valgrind/drmemory/suppressions_full.txt
@@ -1162,11 +1162,6 @@ name=http://crbug.com/116277
 *!zipCloseFileInZipRaw64
 
 LEAK
-name=http://crbug.com/115296
-...
-*!ModuleSystemTest*
-
-LEAK
 name=http://crbug.com/117427 a
 ...
 *!net::HostCache::Set
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index b1d6d21..656ae21 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -5786,12 +5786,6 @@
    fun:_ZN7WebCore11SVGDocumentD0Ev
 }
 {
-   bug_118575
-   Memcheck:Leak
-   ...
-   fun:*ModuleSystemTest*
-}
-{
    bug_118890_a
    Memcheck:Leak
    ...