ScriptContextSetTest should close the main frame before finishing the test

extensions/renderer/script_context_set_unittest.cc

Index: extensions/renderer/script_context_set_unittest.cc
diff --git a/extensions/renderer/script_context_set_unittest.cc b/extensions/renderer/script_context_set_unittest.cc
index 44da610fc9c5cd5c0525a56f47926cf8c9e6bf10..59c3e1dc84b624cd1110d53708176f1b9f124eae 100644
--- a/extensions/renderer/script_context_set_unittest.cc
+++ b/extensions/renderer/script_context_set_unittest.cc
@@ -8,12 +8,12 @@
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/features/feature.h"
+#include "extensions/renderer/scoped_web_frame.h"
 #include "extensions/renderer/script_context.h"
 #include "extensions/renderer/script_context_set.h"
 #include "gin/public/context_holder.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/web/WebLocalFrame.h"
-#include "third_party/WebKit/public/web/WebView.h"
+#include "third_party/WebKit/public/web/WebFrame.h"
 #include "v8/include/v8.h"
 
 namespace extensions {
@@ -21,44 +21,43 @@ namespace extensions {
 TEST(ScriptContextSetTest, Lifecycle) {
   base::MessageLoop loop;
 
-  blink::WebView* webview = blink::WebView::create(nullptr);
-  blink::WebLocalFrame* frame =
-      blink::WebLocalFrame::create(blink::WebTreeScopeType::Document, nullptr);
-  webview->setMainFrame(frame);
+  {
+    ScopedWebFrame web_frame;

[not at google - send to devlin, 2015/06/25 15:20:16]

Why do you need to wrap this in {}? Is it because must be destroyed before
loop.RunUntilIdle()?

IIRC that RunUntilIdle is needed because ScriptContextSet::Remove is
asynchronous, it has nothing to do with WebFrame, so I would hope you don't need
to wrap this in a block.

[haraken, 2015/06/26 00:35:34]

Done.

 
-  // Do this after construction of the webview, since it may construct the
-  // Isolate.
-  v8::Isolate* isolate = v8::Isolate::GetCurrent();
+    // Do this after construction of the webview, since it may construct the
+    // Isolate.
+    v8::Isolate* isolate = v8::Isolate::GetCurrent();
 
-  v8::HandleScope handle_scope(isolate);
-  v8::Local<v8::Context> v8_context = v8::Context::New(isolate);
-  v8::Context::Scope context_scope(v8_context);
-  // ScriptContext relies on gin, it just doesn't look like it from here.
-  gin::ContextHolder context_holder(isolate);
-  context_holder.SetContext(v8_context);
+    v8::HandleScope handle_scope(isolate);
+    v8::Local<v8::Context> v8_context = v8::Context::New(isolate);
+    v8::Context::Scope context_scope(v8_context);
+    // ScriptContext relies on gin, it just doesn't look like it from here.
+    gin::ContextHolder context_holder(isolate);
+    context_holder.SetContext(v8_context);
 
-  ExtensionSet extensions;
-  ExtensionIdSet active_extensions;
-  ScriptContextSet context_set(&extensions, &active_extensions);
-  ScriptContext* context = context_set.Register(
-      frame, v8_context, 0, 0);  // no extension group or world ID
+    ExtensionSet extensions;
+    ExtensionIdSet active_extensions;
+    ScriptContextSet context_set(&extensions, &active_extensions);
+    ScriptContext* context = context_set.Register(
+        web_frame.frame(), v8_context, 0, 0);  // no extension group or world ID
 
-  // Context is valid and resembles correctness.
-  EXPECT_TRUE(context->is_valid());
-  EXPECT_EQ(frame, context->web_frame());
-  EXPECT_EQ(v8_context, context->v8_context());
+    // Context is valid and resembles correctness.
+    EXPECT_TRUE(context->is_valid());
+    EXPECT_EQ(web_frame.frame(), context->web_frame());
+    EXPECT_EQ(v8_context, context->v8_context());
 
-  // Context has been correctly added.
-  EXPECT_EQ(1u, context_set.size());
-  EXPECT_EQ(context, context_set.GetByV8Context(v8_context));
+    // Context has been correctly added.
+    EXPECT_EQ(1u, context_set.size());
+    EXPECT_EQ(context, context_set.GetByV8Context(v8_context));
 
-  // Test context is correctly removed.
-  context_set.Remove(context);
-  EXPECT_EQ(0u, context_set.size());
-  EXPECT_EQ(nullptr, context_set.GetByV8Context(v8_context));
+    // Test context is correctly removed.
+    context_set.Remove(context);
+    EXPECT_EQ(0u, context_set.size());
+    EXPECT_EQ(nullptr, context_set.GetByV8Context(v8_context));
 
-  // After removal, the context should be marked for destruction.
-  EXPECT_FALSE(context->is_valid());
+    // After removal, the context should be marked for destruction.
+    EXPECT_FALSE(context->is_valid());
+  }
 
   // Run loop to do the actual deletion.
   loop.RunUntilIdle();