Refactor GuestViewContainer to split out WebView related logic and MimeHandlerView related logic.

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2012 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 "chrome/renderer/chrome_content_renderer_client.h"
 
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
@@ skipping 102 matching lines @@
 #include "chrome/renderer/extensions/extension_frame_helper.h"
 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h"
 #include "chrome/renderer/extensions/resource_request_policy.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/extension_urls.h"
 #include "extensions/common/switches.h"
 #include "extensions/renderer/dispatcher.h"
 #include "extensions/renderer/extension_helper.h"
 #include "extensions/renderer/extensions_render_frame_observer.h"
-#include "extensions/renderer/guest_view/guest_view_container.h"
+#include "extensions/renderer/guest_view/mime_handler_view_container.h"
+#include "extensions/renderer/guest_view/web_view_container.h"
 #include "extensions/renderer/script_context.h"
 #endif
 
 #if defined(ENABLE_FULL_PRINTING)
 #include "chrome/renderer/pepper/chrome_pdf_print_client.h"
 #endif
 
 #if defined(ENABLE_SPELLCHECK)
 #include "chrome/renderer/spellchecker/spellcheck.h"
 #include "chrome/renderer/spellchecker/spellcheck_provider.h"
@@ skipping 1442 matching lines @@
     return true;
 
   chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
   return channel <= chrome::VersionInfo::CHANNEL_DEV;
 #else
   return false;
 #endif
 }
 
 content::BrowserPluginDelegate*
-ChromeContentRendererClient::CreateBrowserPluginDelegate(
+ChromeContentRendererClient::CreateWebViewContainer(

[Fady Samuel, 2014/11/03 11:03:37]

Content should not know the distinction between MimeHandlrViewContainer and
ExtensionsGuestViewContainer (or whatever else name you choose, WebViewContainer
is inappropriate because there are multiple types of GuestViews).

[raymes, 2014/11/03 22:51:31]

Done.

+    content::RenderFrame* render_frame) {
+#if defined(ENABLE_EXTENSIONS)
+  return new extensions::WebViewContainer(render_frame);
+#else
+  return NULL;
+#endif
+}
+
+content::BrowserPluginDelegate*
+ChromeContentRendererClient::CreateMimeHandlerViewContainer(
     content::RenderFrame* render_frame,
     const std::string& mime_type) {
 #if defined(ENABLE_EXTENSIONS)
-  return new extensions::GuestViewContainer(render_frame, mime_type);
+  return new extensions::MimeHandlerViewContainer(render_frame, mime_type);
 #else
   return NULL;
 #endif
 }