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

content/renderer/render_frame_impl.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 329 matching lines @@
   blink::WebNode GetContextMenuNode() const override;
   blink::WebPlugin* CreatePlugin(
       blink::WebFrame* frame,
       const WebPluginInfo& info,
       const blink::WebPluginParams& params,
       scoped_ptr<PluginInstanceThrottler> throttler) override;
   void LoadURLExternally(blink::WebLocalFrame* frame,
                          const blink::WebURLRequest& request,
                          blink::WebNavigationPolicy policy) override;
   void ExecuteJavaScript(const base::string16& javascript) override;
+  bool IsMainFrame() override;
   bool IsHidden() override;
   ServiceRegistry* GetServiceRegistry() override;
 #if defined(ENABLE_PLUGINS)
   void RegisterPeripheralPlugin(
       const url::Origin& content_origin,
       const base::Closure& unthrottle_callback) override;
   PluginPowerSaverHelper* plugin_power_saver_helper() {
     return plugin_power_saver_helper_;
   }
 #endif
@@ skipping 496 matching lines @@
   // Connects to a Mojo application and returns a proxy to its exposed
   // ServiceProvider.
   mojo::ServiceProviderPtr ConnectToApplication(const GURL& url);
 
   // Stores the WebLocalFrame we are associated with.  This is null from the
   // constructor until SetWebFrame is called, and it is null after
   // frameDetached is called until destruction (which is asynchronous in the
   // case of the main frame, but not subframes).
   blink::WebLocalFrame* frame_;
 
-  // Boolean value indicating whether this RenderFrameImpl object is for a
-  // subframe or not. It remains accurate during destruction, even when |frame_|
-  // has been invalidated.
-  bool is_subframe_;
+  // Boolean value indicating whether this RenderFrameImpl object is for the
+  // main frame or not. It remains accurate during destruction, even when
+  // |frame_| has been invalidated.
+  bool is_main_frame_;
 
   // Frame is a local root if it is rendered in a process different than parent
   // or it is a main frame.
   bool is_local_root_;
 
   base::WeakPtr<RenderViewImpl> render_view_;
   int routing_id_;
   bool is_swapped_out_;
 
   // RenderFrameProxy exists only when is_swapped_out_ is true.
@@ skipping 169 matching lines @@
 #endif
 
   base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_