Separate ContentSettingsClient out from LocalFrameClient

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 552 matching lines @@
 
 WebVector<WebIconURL> WebLocalFrameImpl::iconURLs(int iconTypesMask) const {
   // The URL to the icon may be in the header. As such, only
   // ask the loader for the icon if it's finished loading.
   if (frame()->document()->loadEventFinished())
     return frame()->document()->iconURLs(iconTypesMask);
   return WebVector<WebIconURL>();
 }
 
 void WebLocalFrameImpl::setContentSettingsClient(
-    WebContentSettingsClient* contentSettingsClient) {
-  m_contentSettingsClient = contentSettingsClient;
+    WebContentSettingsClient* client) {
+  m_contentSettingsClient.setClient(client);
 }
 
 void WebLocalFrameImpl::setSharedWorkerRepositoryClient(
     WebSharedWorkerRepositoryClient* client) {
   m_sharedWorkerRepositoryClient =
       SharedWorkerRepositoryClientImpl::create(client);
 }
 
 ScrollableArea* WebLocalFrameImpl::layoutViewportScrollableArea() const {
   if (FrameView* view = frameView())
@@ skipping 971 matching lines @@
 WebLocalFrameImpl::WebLocalFrameImpl(
     WebTreeScopeType scope,
     WebFrameClient* client,
     blink::InterfaceProvider* interfaceProvider,
     blink::InterfaceRegistry* interfaceRegistry)
     : WebLocalFrame(scope),
       m_localFrameClientImpl(LocalFrameClientImpl::create(this)),
       m_frameWidget(0),
       m_client(client),
       m_autofillClient(0),
-      m_contentSettingsClient(0),
       m_inputEventsScaleFactorForEmulation(1),
       m_interfaceProvider(interfaceProvider),
       m_interfaceRegistry(interfaceRegistry),
       m_webDevToolsFrontend(0),
       m_inputMethodController(new WebInputMethodControllerImpl(this)),
       m_textCheckerClient(new TextCheckerClientImpl(this)),
       m_selfKeepAlive(this) {
   DCHECK(m_client);
   frameCount++;
 }
@@ skipping 944 matching lines @@
         createMarkup(endPosition, startPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   }
 }
 
 TextCheckerClient& WebLocalFrameImpl::textCheckerClient() const {
   return *m_textCheckerClient;
 }
 
 }  // namespace blink