Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver

android_webview/android_webview.gyp

 # Copyright 2009 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.
 {
   'variables': {
     'chromium_code': 1,
   },
   'conditions': [
     ['android_webview_build==0', {
       'includes': [
@@ skipping 192 matching lines @@
         'common/url_constants.h',
         'lib/aw_browser_dependency_factory_impl.cc',
         'lib/aw_browser_dependency_factory_impl.h',
         'lib/main/aw_main_delegate.cc',
         'lib/main/aw_main_delegate.h',
         'public/browser/draw_gl.h',
         'renderer/aw_content_renderer_client.cc',
         'renderer/aw_content_renderer_client.h',
         'renderer/aw_key_systems.cc',
         'renderer/aw_key_systems.h',
+        'renderer/aw_permission_client.cc',
+        'renderer/aw_permission_client.h',

[mkosiba (inactive), 2013/12/16 10:18:01]

I think you forgot to add these to the CL

[jam, 2013/12/16 18:52:31]

yep, thanks I've fixed that now. I wasn't able to do try runs until blink
rolled, but then I gave up and added a temporary roll in my change to be able to
test other platforms.

         'renderer/aw_render_process_observer.cc',
         'renderer/aw_render_process_observer.h',
         'renderer/aw_render_view_ext.cc',
         'renderer/aw_render_view_ext.h',
         'renderer/print_web_view_helper.cc',
         'renderer/print_web_view_helper.h',
         'renderer/print_web_view_helper_android.cc',
         'renderer/print_web_view_helper_linux.cc',
       ],
     },
     {
       'target_name': 'android_webview_java',
       'type': 'none',
       'dependencies': [
         '../components/components.gyp:navigation_interception_java',
         '../components/components.gyp:web_contents_delegate_android_java',
         '../content/content.gyp:content_java',
         '../ui/android/ui_android.gyp:ui_java',
       ],
       'variables': {
         'java_in_dir': '../android_webview/java',
       },
       'includes': [ '../build/java.gypi' ],
     },
   ],
 }