Introduce RenderFrame::IsMainFrame and clean up a few things.

content/renderer/render_frame_impl_browsertest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
 #include "content/common/frame_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/test/frame_load_waiter.h"
 #include "content/public/test/render_view_test.h"
@@ skipping 15 matching lines @@
 
 // RenderFrameImplTest creates a RenderFrameImpl that is a child of the
 // main frame, and has its own RenderWidget. This behaves like an out
 // of process frame even though it is in the same process as its parent.
 class RenderFrameImplTest : public RenderViewTest {
  public:
   ~RenderFrameImplTest() override {}
 
   void SetUp() override {
     RenderViewTest::SetUp();
-    EXPECT_FALSE(static_cast<RenderFrameImpl*>(view_->GetMainRenderFrame())
-                     ->is_subframe_);
+    EXPECT_TRUE(static_cast<RenderFrameImpl*>(view_->GetMainRenderFrame())
+                    ->is_main_frame_);
 
     FrameMsg_NewFrame_WidgetParams widget_params;
     widget_params.routing_id = kSubframeWidgetRouteId;
     widget_params.hidden = false;
 
     IsolateAllSitesForTesting(base::CommandLine::ForCurrentProcess());
 
     LoadHTML("Parent frame <iframe name='frame'></iframe>");
 
     RenderFrameImpl::FromWebFrame(
         view_->GetMainRenderFrame()->GetWebFrame()->firstChild())
         ->OnSwapOut(kFrameProxyRouteId, false, FrameReplicationState());
 
     RenderFrameImpl::CreateFrame(kSubframeRouteId, MSG_ROUTING_NONE,
                                  MSG_ROUTING_NONE, kFrameProxyRouteId,
                                  MSG_ROUTING_NONE, FrameReplicationState(),
                                  &compositor_deps_, widget_params);
 
     frame_ = RenderFrameImpl::FromRoutingID(kSubframeRouteId);
-    EXPECT_TRUE(frame_->is_subframe_);
+    EXPECT_FALSE(frame_->is_main_frame_);
   }
 
   void TearDown() override {
 #if defined(LEAK_SANITIZER)
      // Do this before shutting down V8 in RenderViewTest::TearDown().
      // http://crbug.com/328552
      __lsan_do_leak_check();
 #endif
      RenderViewTest::TearDown();
   }
@@ skipping 80 matching lines @@
   RenderFrameTestObserver observer(frame());
 
   ViewMsg_WasShown was_shown_message(0, true, ui::LatencyInfo());
   frame_widget()->OnMessageReceived(was_shown_message);
 
   EXPECT_FALSE(frame_widget()->is_hidden());
   EXPECT_TRUE(observer.visible());
 }
 
 }  // namespace