Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver

content/shell/renderer/shell_render_frame_observer.cc

Index: content/shell/renderer/shell_render_frame_observer.cc
===================================================================
--- content/shell/renderer/shell_render_frame_observer.cc	(revision 0)
+++ content/shell/renderer/shell_render_frame_observer.cc	(revision 0)
@@ -0,0 +1,28 @@
+// 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.
+
+#include "content/shell/renderer/shell_render_frame_observer.h"
+
+#include "base/command_line.h"
+#include "content/shell/common/shell_switches.h"
+#include "content/shell/renderer/shell_render_process_observer.h"
+#include "third_party/WebKit/public/testing/WebTestInterfaces.h"
+#include "third_party/WebKit/public/testing/WebTestRunner.h"
+#include "third_party/WebKit/public/web/WebFrame.h"
+
+namespace content {
+
+ShellRenderFrameObserver::ShellRenderFrameObserver(RenderFrame* render_frame)
+    : RenderFrameObserver(render_frame) {
+}
+
+void ShellRenderFrameObserver::WebFrameCreated(blink::WebFrame* frame) {
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
+    return;
+  frame->setPermissionClient(
+      ShellRenderProcessObserver::GetInstance()->test_interfaces()->testRunner()
+          ->webPermissions());
+}
+
+}  // namespace content
Property changes on: content\shell\renderer\shell_render_frame_observer.cc
___________________________________________________________________
Added: svn:eol-style
   + LF