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

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

Issue 1293673002: Create thread-safe RendererExtensionRegistry from ExtensionSet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
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 <vector> 5 #include <vector>
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "extensions/common/extension.h" 8 #include "extensions/common/extension.h"
9 #include "extensions/common/extension_set.h" 9 #include "extensions/common/extension_set.h"
10 #include "extensions/common/features/feature.h" 10 #include "extensions/common/features/feature.h"
(...skipping 15 matching lines...) Expand all
26 // Isolate. 26 // Isolate.
27 v8::Isolate* isolate = v8::Isolate::GetCurrent(); 27 v8::Isolate* isolate = v8::Isolate::GetCurrent();
28 28
29 v8::HandleScope handle_scope(isolate); 29 v8::HandleScope handle_scope(isolate);
30 v8::Local<v8::Context> v8_context = v8::Context::New(isolate); 30 v8::Local<v8::Context> v8_context = v8::Context::New(isolate);
31 v8::Context::Scope context_scope(v8_context); 31 v8::Context::Scope context_scope(v8_context);
32 // ScriptContext relies on gin, it just doesn't look like it from here. 32 // ScriptContext relies on gin, it just doesn't look like it from here.
33 gin::ContextHolder context_holder(isolate); 33 gin::ContextHolder context_holder(isolate);
34 context_holder.SetContext(v8_context); 34 context_holder.SetContext(v8_context);
35 35
36 ExtensionSet extensions;
37 ExtensionIdSet active_extensions; 36 ExtensionIdSet active_extensions;
38 ScriptContextSet context_set(&extensions, &active_extensions); 37 ScriptContextSet context_set(&active_extensions);
39 ScriptContext* context = context_set.Register( 38 ScriptContext* context = context_set.Register(
40 web_frame.frame(), v8_context, 0, 0); // no extension group or world ID 39 web_frame.frame(), v8_context, 0, 0); // no extension group or world ID
41 40
42 // Context is valid and resembles correctness. 41 // Context is valid and resembles correctness.
43 EXPECT_TRUE(context->is_valid()); 42 EXPECT_TRUE(context->is_valid());
44 EXPECT_EQ(web_frame.frame(), context->web_frame()); 43 EXPECT_EQ(web_frame.frame(), context->web_frame());
45 EXPECT_EQ(v8_context, context->v8_context()); 44 EXPECT_EQ(v8_context, context->v8_context());
46 45
47 // Context has been correctly added. 46 // Context has been correctly added.
48 EXPECT_EQ(1u, context_set.size()); 47 EXPECT_EQ(1u, context_set.size());
49 EXPECT_EQ(context, context_set.GetByV8Context(v8_context)); 48 EXPECT_EQ(context, context_set.GetByV8Context(v8_context));
50 49
51 // Test context is correctly removed. 50 // Test context is correctly removed.
52 context_set.Remove(context); 51 context_set.Remove(context);
53 EXPECT_EQ(0u, context_set.size()); 52 EXPECT_EQ(0u, context_set.size());
54 EXPECT_EQ(nullptr, context_set.GetByV8Context(v8_context)); 53 EXPECT_EQ(nullptr, context_set.GetByV8Context(v8_context));
55 54
56 // After removal, the context should be marked for destruction. 55 // After removal, the context should be marked for destruction.
57 EXPECT_FALSE(context->is_valid()); 56 EXPECT_FALSE(context->is_valid());
58 57
59 // Run loop to do the actual deletion. 58 // Run loop to do the actual deletion.
60 loop.RunUntilIdle(); 59 loop.RunUntilIdle();
61 } 60 }
62 61
63 } // namespace extensions 62 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/renderer/script_context_set.cc ('k') | extensions/renderer/script_injection_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698