Index: content/shell/renderer/layout_test/webkit_test_runner.cc |
diff --git a/content/shell/renderer/layout_test/webkit_test_runner.cc b/content/shell/renderer/layout_test/webkit_test_runner.cc |
index b33b290fab62d4ec46ff8d15ae53840ddd12553a..19bb93100008af3304b6bbba8d55513133011617 100644 |
--- a/content/shell/renderer/layout_test/webkit_test_runner.cc |
+++ b/content/shell/renderer/layout_test/webkit_test_runner.cc |
@@ -657,14 +657,17 @@ void WebKitTestRunner::Reset() { |
current_entry_indexes_.clear(); |
render_view()->ClearEditCommands(); |
- render_view()->GetWebView()->mainFrame()->setName(WebString()); |
+ if (render_view()->GetWebView()->mainFrame()->isWebLocalFrame()) |
+ render_view()->GetWebView()->mainFrame()->setName(WebString()); |
render_view()->GetWebView()->mainFrame()->clearOpener(); |
// Resetting the internals object also overrides the WebPreferences, so we |
// have to sync them to WebKit again. |
- WebTestingSupport::resetInternalsObject( |
- render_view()->GetWebView()->mainFrame()->toWebLocalFrame()); |
- render_view()->SetWebkitPreferences(render_view()->GetWebkitPreferences()); |
+ if (render_view()->GetWebView()->mainFrame()->isWebLocalFrame()) { |
+ WebTestingSupport::resetInternalsObject( |
+ render_view()->GetWebView()->mainFrame()->toWebLocalFrame()); |
+ render_view()->SetWebkitPreferences(render_view()->GetWebkitPreferences()); |
+ } |
} |
// Private methods ----------------------------------------------------------- |