Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver

chrome/renderer/plugins/chrome_plugin_placeholder.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 CHROME_RENDERER_PLUGINS_CHROME_PLUGIN_PLACEHOLDER_H_
 #define CHROME_RENDERER_PLUGINS_CHROME_PLUGIN_PLACEHOLDER_H_
 
 #include "components/plugins/renderer/plugin_placeholder.h"
 
 struct ChromeViewHostMsg_GetPluginInfo_Status;
@@ skipping 79 matching lines @@
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   // |routing_id()| is the routing ID of our associated RenderView, but we have
   // a separate routing ID for messages specific to this placeholder.
   int32 placeholder_routing_id_;
 #endif
 
   bool has_host_;
   int context_menu_request_id_;  // Nonzero when request pending.
   base::string16 plugin_name_;
 
-  // TODO(jam): remove this class, it's temporary until ContentSettingObserver
-  // is a RenderFrameObserver.
-  class RenderViewObserver;
-  scoped_ptr<RenderViewObserver> view_observer_;
-
   DISALLOW_COPY_AND_ASSIGN(ChromePluginPlaceholder);
 };
 
 #endif  // CHROME_RENDERER_PLUGINS_CHROME_PLUGIN_PLACEHOLDER_H_