Revert of Refactor frame navigation/detach state cleanup to be more sane.

Source/core/css/MediaQueryEvaluatorTest.cpp

Index: Source/core/css/MediaQueryEvaluatorTest.cpp
diff --git a/Source/core/css/MediaQueryEvaluatorTest.cpp b/Source/core/css/MediaQueryEvaluatorTest.cpp
index e8e551c461912efe126faa8085237f4907fde4de..5d1ff47a9c8900c61adeda06390d27fac30b92d2 100644
--- a/Source/core/css/MediaQueryEvaluatorTest.cpp
+++ b/Source/core/css/MediaQueryEvaluatorTest.cpp
@@ -152,12 +152,13 @@
 TEST(MediaQueryEvaluatorTest, DynamicNoView)
 {
     OwnPtr<DummyPageHolder> pageHolder = DummyPageHolder::create(IntSize(500, 500));
-    RefPtrWillBeRawPtr<LocalFrame> frame = &pageHolder->frame();
-    pageHolder.clear();
-    ASSERT_EQ(nullptr, frame->view());
-    MediaQueryEvaluator mediaQueryEvaluator(frame.get());
-    RefPtrWillBeRawPtr<MediaQuerySet> querySet = MediaQuerySet::create("foobar");
-    EXPECT_FALSE(mediaQueryEvaluator.eval(querySet.get()));
+    RefPtrWillBePersistent<FrameView> view = pageHolder->frame().view();
+    pageHolder->frame().setView(nullptr);
+    MediaQueryEvaluator mediaQueryEvaluator(&pageHolder->frame());
+    RefPtrWillBePersistent<MediaQuerySet> querySet = MediaQuerySet::create("foobar");
+    bool output = false;
+    ASSERT_EQ(output, mediaQueryEvaluator.eval(querySet.get()));
+    pageHolder->frame().setView(view);
 }
 
 } // namespace