OLD | NEW |
---|---|
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" | |
25 #include "ui/base/resource/resource_bundle.h" | 26 #include "ui/base/resource/resource_bundle.h" |
26 | 27 |
27 namespace extensions { | 28 namespace extensions { |
28 namespace { | 29 namespace { |
29 | 30 |
30 class FailsOnException : public ModuleSystem::ExceptionHandler { | 31 class FailsOnException : public ModuleSystem::ExceptionHandler { |
31 public: | 32 public: |
32 FailsOnException() : ModuleSystem::ExceptionHandler(nullptr) {} | 33 FailsOnException() : ModuleSystem::ExceptionHandler(nullptr) {} |
33 void HandleUncaughtException(const v8::TryCatch& try_catch) override { | 34 void HandleUncaughtException(const v8::TryCatch& try_catch) override { |
34 FAIL() << "Uncaught exception: " << CreateExceptionString(try_catch); | 35 FAIL() << "Uncaught exception: " << CreateExceptionString(try_catch); |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
233 env_.reset(); | 234 env_.reset(); |
234 v8::HeapStatistics stats; | 235 v8::HeapStatistics stats; |
235 isolate_->GetHeapStatistics(&stats); | 236 isolate_->GetHeapStatistics(&stats); |
236 size_t old_heap_size = 0; | 237 size_t old_heap_size = 0; |
237 // Run the GC until the heap size reaches a steady state to ensure that | 238 // Run the GC until the heap size reaches a steady state to ensure that |
238 // all the garbage is collected. | 239 // all the garbage is collected. |
239 while (stats.used_heap_size() != old_heap_size) { | 240 while (stats.used_heap_size() != old_heap_size) { |
240 old_heap_size = stats.used_heap_size(); | 241 old_heap_size = stats.used_heap_size(); |
241 isolate_->RequestGarbageCollectionForTesting( | 242 isolate_->RequestGarbageCollectionForTesting( |
242 v8::Isolate::kFullGarbageCollection); | 243 v8::Isolate::kFullGarbageCollection); |
244 blink::WebHeap::collectAllGarbageForTesting(); | |
sof
2016/01/26 06:09:43
The v8 major GC will trigger Oilpan GCs also, so u
sof
2016/01/26 08:05:44
https://build.chromium.org/p/chromium.memory.fyi/b
haraken
2016/01/26 08:26:40
Doesn't collectAllGarbage always collect more obje
| |
243 isolate_->GetHeapStatistics(&stats); | 245 isolate_->GetHeapStatistics(&stats); |
244 } | 246 } |
245 } | 247 } |
246 | 248 |
247 scoped_ptr<ModuleSystemTestEnvironment> ModuleSystemTest::CreateEnvironment() { | 249 scoped_ptr<ModuleSystemTestEnvironment> ModuleSystemTest::CreateEnvironment() { |
248 return make_scoped_ptr(new ModuleSystemTestEnvironment(isolate_)); | 250 return make_scoped_ptr(new ModuleSystemTestEnvironment(isolate_)); |
249 } | 251 } |
250 | 252 |
251 void ModuleSystemTest::ExpectNoAssertionsMade() { | 253 void ModuleSystemTest::ExpectNoAssertionsMade() { |
252 should_assertions_be_made_ = false; | 254 should_assertions_be_made_ = false; |
253 } | 255 } |
254 | 256 |
255 void ModuleSystemTest::RunResolvedPromises() { | 257 void ModuleSystemTest::RunResolvedPromises() { |
256 isolate_->RunMicrotasks(); | 258 isolate_->RunMicrotasks(); |
257 } | 259 } |
258 | 260 |
259 } // namespace extensions | 261 } // namespace extensions |
OLD | NEW |