Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(500)

Side by Side Diff: extensions/renderer/module_system_test.cc

Issue 1637013002: Revert of Fix leaks in exensions_unittests after enabling Oilpan (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | tools/valgrind/memcheck/suppressions.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/renderer/module_system_test.h" 5 #include "extensions/renderer/module_system_test.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 #include <utility> 11 #include <utility>
12 12
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
15 #include "base/files/file_util.h" 15 #include "base/files/file_util.h"
16 #include "base/lazy_instance.h" 16 #include "base/lazy_instance.h"
17 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
18 #include "base/path_service.h" 18 #include "base/path_service.h"
19 #include "base/strings/string_piece.h" 19 #include "base/strings/string_piece.h"
20 #include "extensions/common/extension_paths.h" 20 #include "extensions/common/extension_paths.h"
21 #include "extensions/renderer/logging_native_handler.h" 21 #include "extensions/renderer/logging_native_handler.h"
22 #include "extensions/renderer/object_backed_native_handler.h" 22 #include "extensions/renderer/object_backed_native_handler.h"
23 #include "extensions/renderer/safe_builtins.h" 23 #include "extensions/renderer/safe_builtins.h"
24 #include "extensions/renderer/utils_native_handler.h" 24 #include "extensions/renderer/utils_native_handler.h"
25 #include "third_party/WebKit/public/web/WebHeap.h"
26 #include "ui/base/resource/resource_bundle.h" 25 #include "ui/base/resource/resource_bundle.h"
27 26
28 namespace extensions { 27 namespace extensions {
29 namespace { 28 namespace {
30 29
31 class FailsOnException : public ModuleSystem::ExceptionHandler { 30 class FailsOnException : public ModuleSystem::ExceptionHandler {
32 public: 31 public:
33 FailsOnException() : ModuleSystem::ExceptionHandler(nullptr) {} 32 FailsOnException() : ModuleSystem::ExceptionHandler(nullptr) {}
34 void HandleUncaughtException(const v8::TryCatch& try_catch) override { 33 void HandleUncaughtException(const v8::TryCatch& try_catch) override {
35 FAIL() << "Uncaught exception: " << CreateExceptionString(try_catch); 34 FAIL() << "Uncaught exception: " << CreateExceptionString(try_catch);
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 env_.reset(); 233 env_.reset();
235 v8::HeapStatistics stats; 234 v8::HeapStatistics stats;
236 isolate_->GetHeapStatistics(&stats); 235 isolate_->GetHeapStatistics(&stats);
237 size_t old_heap_size = 0; 236 size_t old_heap_size = 0;
238 // Run the GC until the heap size reaches a steady state to ensure that 237 // Run the GC until the heap size reaches a steady state to ensure that
239 // all the garbage is collected. 238 // all the garbage is collected.
240 while (stats.used_heap_size() != old_heap_size) { 239 while (stats.used_heap_size() != old_heap_size) {
241 old_heap_size = stats.used_heap_size(); 240 old_heap_size = stats.used_heap_size();
242 isolate_->RequestGarbageCollectionForTesting( 241 isolate_->RequestGarbageCollectionForTesting(
243 v8::Isolate::kFullGarbageCollection); 242 v8::Isolate::kFullGarbageCollection);
244 blink::WebHeap::collectAllGarbageForTesting();
245 isolate_->GetHeapStatistics(&stats); 243 isolate_->GetHeapStatistics(&stats);
246 } 244 }
247 } 245 }
248 246
249 scoped_ptr<ModuleSystemTestEnvironment> ModuleSystemTest::CreateEnvironment() { 247 scoped_ptr<ModuleSystemTestEnvironment> ModuleSystemTest::CreateEnvironment() {
250 return make_scoped_ptr(new ModuleSystemTestEnvironment(isolate_)); 248 return make_scoped_ptr(new ModuleSystemTestEnvironment(isolate_));
251 } 249 }
252 250
253 void ModuleSystemTest::ExpectNoAssertionsMade() { 251 void ModuleSystemTest::ExpectNoAssertionsMade() {
254 should_assertions_be_made_ = false; 252 should_assertions_be_made_ = false;
255 } 253 }
256 254
257 void ModuleSystemTest::RunResolvedPromises() { 255 void ModuleSystemTest::RunResolvedPromises() {
258 isolate_->RunMicrotasks(); 256 isolate_->RunMicrotasks();
259 } 257 }
260 258
261 } // namespace extensions 259 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | tools/valgrind/memcheck/suppressions.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698