Update to Chromium revision cb947c01 (#352221)

- Implement CefRequestHandler::OnBeforeBrowse using NavigationThrottle instead of ResourceThrottle (see http://crbug.com/537634). The CefRequest object passed to OnBeforeBrowse will no longer have an associated request identifier. - Mac: Remove additional helper apps which are no longer required (see http://crbug.com/520680) - Remove the UR_FLAG_REPORT_RAW_HEADERS flag which is no longer supported (see http://crbug.com/517114) - Remove the CefBrowserSettings.java parameter. Java is an NPAPI plugin and NPAPI plugins are no longer supported (see http://crbug.com/470301#c11) - Add CefFormatUrlForSecurityDisplay function in cef_parser.h - Fix crash when passing `--disable-extensions` command-line flag (issue #1721) - Linux: Fix NSS handler loading (issue #1727)
2025-06-05 21:39:12 +02:00 · 2015-10-09 11:23:12 -04:00
parent 5780ea8baa
commit 8aac23386e
104 changed files with 938 additions and 940 deletions
--- a/libcef/browser/browser_context_impl.cc
+++ b/libcef/browser/browser_context_impl.cc
@@ -328,8 +328,7 @@ net::URLRequestContextGetter* CefBrowserContextImpl::CreateRequestContext(
  DCHECK(!url_request_getter_.get());

  // Initialize the proxy configuration service.
-  scoped_ptr<net::ProxyConfigService> proxy_config_service;
-  proxy_config_service.reset(
+  scoped_ptr<net::ProxyConfigService> proxy_config_service(
      ProxyServiceFactory::CreateProxyConfigService(
          pref_proxy_config_tracker_.get()));

--- a/libcef/browser/browser_context_impl.h
+++ b/libcef/browser/browser_context_impl.h
@@ -14,7 +14,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/net/pref_proxy_config_tracker.h"
+#include "components/proxy_config/pref_proxy_config_tracker.h"

 namespace content {
 class DownloadManagerDelegate;
--- a/libcef/browser/browser_host_impl.cc
+++ b/libcef/browser/browser_host_impl.cc
@@ -414,15 +414,10 @@ bool CefBrowserHost::CreateBrowser(
  }

  // Verify windowless rendering requirements.
-  if (windowInfo.windowless_rendering_enabled) {
-    if (!client->GetRenderHandler().get()) {
-      NOTREACHED() << "CefRenderHandler implementation is required";
-      return false;
-    }
-    if (!content::IsDelegatedRendererEnabled()) {
-      NOTREACHED() << "Delegated renderer must be enabled";
-      return false;
-    }
+  if (windowInfo.windowless_rendering_enabled &&
+      !client->GetRenderHandler().get()) {
+    NOTREACHED() << "CefRenderHandler implementation is required";
+    return false;
  }

  // Create the browser on the UI thread.
@@ -479,15 +474,10 @@ CefRefPtr<CefBrowserHostImpl> CefBrowserHostImpl::Create(
    bool is_popup,
    CefRefPtr<CefRequestContext> request_context) {
  // Verify windowless rendering requirements.
-  if (windowInfo.windowless_rendering_enabled) {
-    if (!client->GetRenderHandler().get()) {
-      NOTREACHED() << "CefRenderHandler implementation is required";
-      return NULL;
-    }
-    if (!content::IsDelegatedRendererEnabled()) {
-      NOTREACHED() << "Delegated renderer must be enabled";
-      return NULL;
-    }
+  if (windowInfo.windowless_rendering_enabled &&
+      !client->GetRenderHandler().get()) {
+    NOTREACHED() << "CefRenderHandler implementation is required";
+    return NULL;
  }

  scoped_refptr<CefBrowserInfo> info =
--- a/libcef/browser/browser_host_impl_mac.mm
+++ b/libcef/browser/browser_host_impl_mac.mm
@@ -28,7 +28,6 @@
 #include "grit/ui_strings.h"
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "third_party/WebKit/public/web/mac/WebInputEventFactory.h"
 #import  "ui/base/cocoa/underlay_opengl_hosting_window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/keycodes/keyboard_codes_posix.h"
--- a/libcef/browser/browser_pref_store.cc
+++ b/libcef/browser/browser_pref_store.cc
@@ -13,12 +13,12 @@
 #include "base/prefs/pref_registry_simple.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/pref_registry/pref_registry_syncable.h"
+#include "components/proxy_config/pref_proxy_config_tracker_impl.h"
 #include "components/proxy_config/proxy_config_dictionary.h"
 #include "extensions/browser/extension_prefs.h"
 #include "grit/cef_strings.h"
--- a/libcef/browser/browser_settings.cc
+++ b/libcef/browser/browser_settings.cc
@@ -106,7 +106,6 @@ void BrowserToWebSettings(const CefBrowserSettings& cef,
      web.javascript_can_access_clipboard);
  SET_STATE(cef.javascript_dom_paste, web.dom_paste_enabled);
  SET_STATE(cef.caret_browsing, web.caret_browsing_enabled);
-  SET_STATE(cef.java, web.java_enabled);
  SET_STATE(cef.plugins, web.plugins_enabled);
  SET_STATE(cef.universal_access_from_file_urls,
      web.allow_universal_access_from_file_urls);
--- a/libcef/browser/browser_urlrequest_impl.cc
+++ b/libcef/browser/browser_urlrequest_impl.cc
@@ -307,9 +307,6 @@ class CefBrowserURLRequest::Context
      upload_data_size_ = upload_data_size;
    }

-    if (cef_flags & UR_FLAG_REPORT_RAW_HEADERS)
-      load_flags |= net::LOAD_REPORT_RAW_HEADERS;
-
    fetcher_->SetLoadFlags(load_flags);

    fetcher_->SetExtraRequestHeaders(
--- a/libcef/browser/chrome_browser_process_stub.cc
+++ b/libcef/browser/chrome_browser_process_stub.cc
@@ -66,13 +66,14 @@ net::URLRequestContextGetter*
  return NULL;
 }

-chrome_variations::VariationsService*
+variations::VariationsService*
  ChromeBrowserProcessStub::variations_service() {
  NOTIMPLEMENTED();
  return NULL;
 }

-PromoResourceService* ChromeBrowserProcessStub::promo_resource_service() {
+web_resource::PromoResourceService*
+ChromeBrowserProcessStub::promo_resource_service() {
  NOTIMPLEMENTED();
  return NULL;
 }
@@ -217,7 +218,7 @@ void ChromeBrowserProcessStub::StartAutoupdateTimer() {
 }
 #endif

-ChromeNetLog* ChromeBrowserProcessStub::net_log() {
+net_log::ChromeNetLog* ChromeBrowserProcessStub::net_log() {
  NOTIMPLEMENTED();
  return NULL;
 }
@@ -273,13 +274,13 @@ gcm::GCMDriver* ChromeBrowserProcessStub::gcm_driver() {
  return NULL;
 }

-memory::OomPriorityManager* ChromeBrowserProcessStub::GetOomPriorityManager() {
-  NOTIMPLEMENTED();
-  return NULL;
-}
-
 ShellIntegration::DefaultWebClientState
 ChromeBrowserProcessStub::CachedDefaultWebClientState() {
  NOTIMPLEMENTED();
  return ShellIntegration::UNKNOWN_DEFAULT;
 }
+
+memory::TabManager* ChromeBrowserProcessStub::GetTabManager() {
+  NOTIMPLEMENTED();
+  return NULL;
+}
--- a/libcef/browser/chrome_browser_process_stub.h
+++ b/libcef/browser/chrome_browser_process_stub.h
@@ -39,8 +39,8 @@ class ChromeBrowserProcessStub : public BrowserProcess {
  ProfileManager* profile_manager() override;
  PrefService* local_state() override;
  net::URLRequestContextGetter* system_request_context() override;
-  chrome_variations::VariationsService* variations_service() override;
-  PromoResourceService* promo_resource_service() override;
+  variations::VariationsService* variations_service() override;
+  web_resource::PromoResourceService* promo_resource_service() override;
  BrowserProcessPlatformPart* platform_part() override;
  extensions::EventRouterForwarder*
      extension_event_router_forwarder() override;
@@ -80,7 +80,7 @@ class ChromeBrowserProcessStub : public BrowserProcess {
  void StartAutoupdateTimer() override;
 #endif

-  ChromeNetLog* net_log() override;
+  net_log::ChromeNetLog* net_log() override;
  component_updater::ComponentUpdateService*
      component_updater() override;
  CRLSetFetcher* crl_set_fetcher() override;
@@ -96,9 +96,9 @@ class ChromeBrowserProcessStub : public BrowserProcess {
 #endif
  network_time::NetworkTimeTracker* network_time_tracker() override;
  gcm::GCMDriver* gcm_driver() override;
-  memory::OomPriorityManager* GetOomPriorityManager() override;
  ShellIntegration::DefaultWebClientState
      CachedDefaultWebClientState() override;
+  memory::TabManager* GetTabManager() override;

 private:
  std::string locale_;
--- a/libcef/browser/chrome_scheme_handler.cc
+++ b/libcef/browser/chrome_scheme_handler.cc
@@ -29,6 +29,7 @@
 #include "content/public/common/url_constants.h"
 #include "content/public/common/user_agent.h"
 #include "grit/cef_resources.h"
+#include "grit/components_resources.h"
 #include "ipc/ipc_channel.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/webui/web_ui_util.h"
@@ -274,10 +275,10 @@ class Delegate : public InternalHandlerDelegate {

  bool OnCredits(const std::string& path, Action* action) {
    if (path == "credits.js") {
-      action->resource_id = IDR_CEF_CREDITS_JS;
+      action->resource_id = IDR_ABOUT_UI_CREDITS_JS;
    } else {
      action->mime_type = "text/html";
-      action->resource_id = IDR_CEF_CREDITS_HTML;
+      action->resource_id = IDR_ABOUT_UI_CREDITS_HTML;
    }
    return true;
  }
--- a/libcef/browser/content_browser_client.cc
+++ b/libcef/browser/content_browser_client.cc
@@ -30,6 +30,7 @@
 #include "libcef/common/command_line_impl.h"
 #include "libcef/common/content_client.h"
 #include "libcef/common/extensions/extensions_util.h"
+#include "libcef/common/request_impl.h"
 #include "libcef/common/scheme_registration.h"

 #include "base/base_switches.h"
@@ -38,13 +39,19 @@
 #include "base/path_service.h"
 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
 #include "chrome/common/chrome_switches.h"
+#include "components/navigation_interception/intercept_navigation_throttle.h"
+#include "components/navigation_interception/navigation_params.h"
+#include "content/browser/frame_host/navigation_handle_impl.h"
+#include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/plugin_service_impl.h"
 #include "content/public/browser/access_token_store.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "content/public/browser/browser_url_handler.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/client_certificate_delegate.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/quota_permission_context.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ -70,8 +77,8 @@

 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "base/debug/leak_annotations.h"
-#include "components/crash/app/breakpad_linux.h"
-#include "components/crash/browser/crash_handler_host_linux.h"
+#include "components/crash/content/app/breakpad_linux.h"
+#include "components/crash/content/browser/crash_handler_host_linux.h"
 #include "content/public/common/content_descriptors.h"
 #endif

@@ -353,6 +360,67 @@ int GetCrashSignalFD(const base::CommandLine& command_line) {
 }
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX)

+// TODO(cef): We can't currently trust NavigationParams::is_main_frame() because
+// it's always set to true in
+// InterceptNavigationThrottle::CheckIfShouldIgnoreNavigation. Remove the
+// |is_main_frame| argument once this problem is fixed.
+bool NavigationOnUIThread(
+    bool is_main_frame,
+    int64 frame_id,
+    int64 parent_frame_id,
+    content::WebContents* source,
+    const navigation_interception::NavigationParams& params) {
+  CEF_REQUIRE_UIT();
+
+  bool ignore_navigation = false;
+
+  CefRefPtr<CefBrowserHostImpl> browser =
+      CefBrowserHostImpl::GetBrowserForContents(source);
+  if (browser.get()) {
+    CefRefPtr<CefClient> client = browser->GetClient();
+    if (client.get()) {
+      CefRefPtr<CefRequestHandler> handler = client->GetRequestHandler();
+      if (handler.get()) {
+        CefRefPtr<CefFrame> frame;
+        if (is_main_frame) {
+          frame = browser->GetMainFrame();
+        } else if (frame_id >= 0) {
+          frame = browser->GetFrame(frame_id);
+          DCHECK(frame);
+        } else {
+          // Create a temporary frame object for navigation of sub-frames that
+          // don't yet exist.
+          frame = new CefFrameHostImpl(browser.get(),
+                                       CefFrameHostImpl::kInvalidFrameId,
+                                       false,
+                                       CefString(),
+                                       CefString(),
+                                       parent_frame_id);
+        }
+
+        CefRefPtr<CefRequestImpl> request = new CefRequestImpl();
+        request->Set(params, is_main_frame);
+        request->SetReadOnly(true);
+
+        ignore_navigation = handler->OnBeforeBrowse(
+            browser.get(), frame, request.get(), params.is_redirect());
+      }
+    }
+  }
+
+  return ignore_navigation;
+}
+
+void FindFrameHostForNavigationHandle(
+    content::NavigationHandle* navigation_handle,
+    content::RenderFrameHost** matching_frame_host,
+    content::RenderFrameHost* current_frame_host) {
+  content::RenderFrameHostImpl* current_impl =
+      static_cast<content::RenderFrameHostImpl*>(current_frame_host);
+  if (current_impl->navigation_handle() == navigation_handle)
+    *matching_frame_host = current_frame_host;
+}
+
 }  // namespace


@@ -964,6 +1032,51 @@ content::DevToolsManagerDelegate*
  return new CefDevToolsManagerDelegate();
 }

+ScopedVector<content::NavigationThrottle>
+CefContentBrowserClient::CreateThrottlesForNavigation(
+    content::NavigationHandle* navigation_handle) {
+  CEF_REQUIRE_UIT();
+
+  ScopedVector<content::NavigationThrottle> throttles;
+
+  const bool is_main_frame = navigation_handle->IsInMainFrame();
+
+  int64 parent_frame_id = CefFrameHostImpl::kUnspecifiedFrameId;
+  if (!is_main_frame) {
+    // Identify the RenderFrameHostImpl that originated the navigation.
+    // TODO(cef): It would be better if NavigationHandle could directly report
+    // the owner RenderFrameHostImpl.
+    // There is additional complexity here if PlzNavigate is enabled. See
+    // comments in content/browser/frame_host/navigation_handle_impl.h.
+    content::WebContents* web_contents = navigation_handle->GetWebContents();
+    content::RenderFrameHost* parent_frame_host = NULL;
+    web_contents->ForEachFrame(
+        base::Bind(FindFrameHostForNavigationHandle,
+                   navigation_handle, &parent_frame_host));
+    DCHECK(parent_frame_host);
+
+    parent_frame_id = parent_frame_host->GetRoutingID();
+    if (parent_frame_id < 0)
+      parent_frame_id = CefFrameHostImpl::kUnspecifiedFrameId;
+  }
+
+  int64 frame_id = CefFrameHostImpl::kInvalidFrameId;
+  if (!is_main_frame && navigation_handle->HasCommitted()) {
+    frame_id = navigation_handle->GetRenderFrameHost()->GetRoutingID();
+    if (frame_id < 0)
+      frame_id = CefFrameHostImpl::kInvalidFrameId;
+  }
+
+  content::NavigationThrottle* throttle =
+      new navigation_interception::InterceptNavigationThrottle(
+          navigation_handle,
+          base::Bind(&NavigationOnUIThread, is_main_frame, frame_id,
+                     parent_frame_id));
+  throttles.push_back(throttle);
+
+  return throttles.Pass();
+}
+
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 void CefContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
    const base::CommandLine& command_line,
--- a/libcef/browser/content_browser_client.h
+++ b/libcef/browser/content_browser_client.h
@@ -137,6 +137,8 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
  void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;
  content::DevToolsManagerDelegate* GetDevToolsManagerDelegate()
      override;
+  ScopedVector<content::NavigationThrottle> CreateThrottlesForNavigation(
+      content::NavigationHandle* navigation_handle) override;

 #if defined(OS_POSIX) && !defined(OS_MACOSX)
  void GetAdditionalMappedFilesForChildProcess(
--- a/libcef/browser/devtools_delegate.cc
+++ b/libcef/browser/devtools_delegate.cc
@@ -111,6 +111,11 @@ std::string CefDevToolsDelegate::GetFrontendResource(
  return content::DevToolsFrontendHost::GetFrontendResource(path).as_string();
 }

+content::DevToolsExternalAgentProxyDelegate*
+CefDevToolsDelegate::HandleWebSocketConnection(const std::string& path) {
+  return nullptr;
+}
+
 std::string CefDevToolsDelegate::GetChromeDevToolsURL() {
  return base::StringPrintf("%s://%s/inspector.html",
      content::kChromeDevToolsScheme, scheme::kChromeDevToolsHost);
--- a/libcef/browser/devtools_delegate.h
+++ b/libcef/browser/devtools_delegate.h
@@ -34,6 +34,8 @@ class CefDevToolsDelegate :
  std::string GetDiscoveryPageHTML() override;
  std::string GetFrontendResource(const std::string& path) override;
  std::string GetPageThumbnailData(const GURL& url) override;
+  content::DevToolsExternalAgentProxyDelegate*
+      HandleWebSocketConnection(const std::string& path) override;

  // Returns the chrome-devtools URL.
  std::string GetChromeDevToolsURL();
--- a/libcef/browser/devtools_frontend.cc
+++ b/libcef/browser/devtools_frontend.cc
@@ -272,6 +272,9 @@ void CefDevToolsFrontend::HandleMessageFromDevToolsFrontend(
    if (!params->GetString(0, &name))
      return;
    preferences_.RemoveWithoutPathExpansion(name, nullptr);
+  } else if (method == "requestFileSystems") {
+    web_contents()->GetMainFrame()->ExecuteJavaScriptForTests(
+        base::ASCIIToUTF16("DevToolsAPI.fileSystemsLoaded([]);"));
  } else {
    return;
  }
--- a/libcef/browser/extensions/extension_system.cc
+++ b/libcef/browser/extensions/extension_system.cc
@@ -35,6 +35,7 @@
 #include "extensions/browser/null_app_sorting.h"
 #include "extensions/browser/quota_service.h"
 #include "extensions/browser/runtime_data.h"
+#include "extensions/browser/service_worker_manager.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/file_util.h"
@@ -131,7 +132,7 @@ void CefExtensionSystem::Init() {
  // 10.Routing of print-related commands are handled by ChromePDFPrintClient
  //    and CefPrintWebViewHelperDelegate in the renderer process.
  // 11.The PDF extension is granted access to chrome://resources via
-  //    CefExtensionsDispatcherDelegate::InitOriginPermissions in the renderer
+  //    CefExtensionWebContentsObserver::RenderViewCreated in the browser
  //    process.
  if (PdfExtensionEnabled()) {
    AddExtension(pdf_extension_util::GetManifest(),
@@ -169,6 +170,7 @@ void CefExtensionSystem::Shutdown() {
 }

 void CefExtensionSystem::InitForRegularProfile(bool extensions_enabled) {
+  service_worker_manager_.reset(new ServiceWorkerManager(browser_context_));
  runtime_data_.reset(new RuntimeData(registry_));
  quota_service_.reset(new QuotaService);
  app_sorting_.reset(new NullAppSorting);
@@ -186,6 +188,10 @@ ManagementPolicy* CefExtensionSystem::management_policy() {
  return nullptr;
 }

+ServiceWorkerManager* CefExtensionSystem::service_worker_manager() {
+  return service_worker_manager_.get();
+}
+
 SharedUserScriptMaster* CefExtensionSystem::shared_user_script_master() {
  return nullptr;
 }
--- a/libcef/browser/extensions/extension_system.h
+++ b/libcef/browser/extensions/extension_system.h
@@ -56,6 +56,7 @@ class CefExtensionSystem : public ExtensionSystem {
  ExtensionService* extension_service() override;
  RuntimeData* runtime_data() override;
  ManagementPolicy* management_policy() override;
+  ServiceWorkerManager* service_worker_manager() override;
  SharedUserScriptMaster* shared_user_script_master() override;
  StateStore* state_store() override;
  StateStore* rules_store() override;
@@ -118,6 +119,7 @@ class CefExtensionSystem : public ExtensionSystem {
  // Data to be accessed on the IO thread. Must outlive process_manager_.
  scoped_refptr<InfoMap> info_map_;

+  scoped_ptr<ServiceWorkerManager> service_worker_manager_;
  scoped_ptr<RuntimeData> runtime_data_;
  scoped_ptr<QuotaService> quota_service_;
  scoped_ptr<AppSorting> app_sorting_;
--- a/libcef/browser/extensions/extension_system_factory.cc
+++ b/libcef/browser/extensions/extension_system_factory.cc
@@ -22,7 +22,7 @@ ExtensionSystem* CefExtensionSystemFactory::GetForBrowserContext(

 // static
 CefExtensionSystemFactory* CefExtensionSystemFactory::GetInstance() {
-  return Singleton<CefExtensionSystemFactory>::get();
+  return base::Singleton<CefExtensionSystemFactory>::get();
 }

 CefExtensionSystemFactory::CefExtensionSystemFactory()
--- a/libcef/browser/extensions/extension_system_factory.h
+++ b/libcef/browser/extensions/extension_system_factory.h
@@ -20,7 +20,7 @@ class CefExtensionSystemFactory : public ExtensionSystemProvider {
  static CefExtensionSystemFactory* GetInstance();

 private:
-  friend struct DefaultSingletonTraits<CefExtensionSystemFactory>;
+  friend struct base::DefaultSingletonTraits<CefExtensionSystemFactory>;

  CefExtensionSystemFactory();
  ~CefExtensionSystemFactory() override;
--- a/libcef/browser/extensions/extension_web_contents_observer.cc
+++ b/libcef/browser/extensions/extension_web_contents_observer.cc
@@ -4,6 +4,11 @@

 #include "libcef/browser/extensions/extension_web_contents_observer.h"

+#include "content/public/browser/child_process_security_policy.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/render_view_host.h"
+#include "content/public/common/url_constants.h"
+
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(extensions::CefExtensionWebContentsObserver);

 namespace extensions {
@@ -16,4 +21,24 @@ CefExtensionWebContentsObserver::CefExtensionWebContentsObserver(
 CefExtensionWebContentsObserver::~CefExtensionWebContentsObserver() {
 }

+void CefExtensionWebContentsObserver::RenderViewCreated(
+    content::RenderViewHost* render_view_host) {
+  ExtensionWebContentsObserver::RenderViewCreated(render_view_host);
+
+  const Extension* extension = GetExtension(render_view_host);
+  if (!extension)
+    return;
+
+  int process_id = render_view_host->GetProcess()->GetID();
+  auto policy = content::ChildProcessSecurityPolicy::GetInstance();
+
+  // Components of chrome that are implemented as extensions or platform apps
+  // are allowed to use chrome://resources/ URLs.
+  if ((extension->is_extension() || extension->is_platform_app()) &&
+      Manifest::IsComponentLocation(extension->location())) {
+    policy->GrantOrigin(process_id,
+                        url::Origin(GURL(content::kChromeUIResourcesURL)));
+  }
+}
+
 }  // namespace extensions
--- a/libcef/browser/extensions/extension_web_contents_observer.h
+++ b/libcef/browser/extensions/extension_web_contents_observer.h
@@ -21,6 +21,9 @@ class CefExtensionWebContentsObserver
      content::WebContents* web_contents);
  ~CefExtensionWebContentsObserver() override;

+  // content::WebContentsObserver overrides.
+  void RenderViewCreated(content::RenderViewHost* render_view_host) override;
+
  DISALLOW_COPY_AND_ASSIGN(CefExtensionWebContentsObserver);
 };

--- a/libcef/browser/extensions/extensions_browser_client.cc
+++ b/libcef/browser/extensions/extensions_browser_client.cc
@@ -156,6 +156,10 @@ bool CefExtensionsBrowserClient::IsRunningInForcedAppMode() {
  return false;
 }

+bool CefExtensionsBrowserClient::IsLoggedInAsPublicAccount()  {
+  return false;
+}
+
 ApiActivityMonitor* CefExtensionsBrowserClient::GetApiActivityMonitor(
    BrowserContext* context) {
  // CEF doesn't monitor API function calls or events.
--- a/libcef/browser/extensions/extensions_browser_client.h
+++ b/libcef/browser/extensions/extensions_browser_client.h
@@ -63,6 +63,7 @@ class CefExtensionsBrowserClient : public ExtensionsBrowserClient {
  bool DidVersionUpdate(content::BrowserContext* context) override;
  void PermitExternalProtocolHandler() override;
  bool IsRunningInForcedAppMode() override;
+  bool IsLoggedInAsPublicAccount() override;
  ApiActivityMonitor* GetApiActivityMonitor(
      content::BrowserContext* context) override;
  ExtensionSystemProvider* GetExtensionSystemFactory() override;
--- a/libcef/browser/frame_host_impl.cc
+++ b/libcef/browser/frame_host_impl.cc
@@ -121,7 +121,7 @@ void CefFrameHostImpl::LoadRequest(CefRefPtr<CefRequest> request) {
    frame_id = (is_main_frame_ ? kMainFrameId : frame_id_);
  }

-  if (browser.get())
+  if (browser.get() && frame_id != kInvalidFrameId)
    browser->LoadRequest(frame_id, request);
 }

@@ -135,7 +135,7 @@ void CefFrameHostImpl::LoadURL(const CefString& url) {
    frame_id = (is_main_frame_ ? kMainFrameId : frame_id_);
  }

-  if (browser.get()) {
+  if (browser.get() && frame_id != kInvalidFrameId) {
    browser->LoadURL(frame_id, url, content::Referrer(),
                     ui::PAGE_TRANSITION_TYPED, std::string());
  }
@@ -152,7 +152,7 @@ void CefFrameHostImpl::LoadString(const CefString& string,
    frame_id = (is_main_frame_ ? kMainFrameId : frame_id_);
  }

-  if (browser.get())
+  if (browser.get() && frame_id != kInvalidFrameId)
    browser->LoadString(frame_id, string, url);
 }

@@ -252,7 +252,7 @@ void CefFrameHostImpl::SendJavaScript(
    frame_id = (is_main_frame_ ? kMainFrameId : frame_id_);
  }

-  if (browser.get())
+  if (browser.get() && frame_id != kInvalidFrameId)
    browser->SendCode(frame_id, true, jsCode, scriptUrl, startLine, NULL);
 }

--- a/libcef/browser/internal_scheme_handler.cc
+++ b/libcef/browser/internal_scheme_handler.cc
@@ -33,9 +33,16 @@ static std::string GetMimeType(const std::string& filename) {
  base::ThreadRestrictions::ScopedAllowIO allow_io;

  std::string mime_type;
-  if (net::GetMimeTypeFromFile(FilePathFromASCII(filename), &mime_type))
+  const base::FilePath& file_path = FilePathFromASCII(filename);
+  if (net::GetMimeTypeFromFile(file_path, &mime_type))
    return mime_type;

+  // Check for newer extensions used by internal resources but not yet
+  // recognized by the mime type detector.
+  const std::string& extension = CefString(file_path.FinalExtension());
+  if (extension == ".woff2")
+    return "application/font-woff2";
+
  NOTREACHED() << "No known mime type for file: " << filename.c_str();
  return "text/plain";
 }
--- a/libcef/browser/javascript_dialog_manager.cc
+++ b/libcef/browser/javascript_dialog_manager.cc
@@ -11,7 +11,7 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/url_formatter/url_formatter.h"
+#include "components/url_formatter/elide_url.h"
 #include "net/base/net_util.h"

 namespace {
@@ -121,7 +121,7 @@ void CefJavaScriptDialogManager::RunJavaScriptDialog(
  }

  base::string16 display_url =
-      url_formatter::FormatUrl(origin_url, accept_lang);
+      url_formatter::FormatUrlForSecurityDisplay(origin_url, accept_lang);

  dialog_.reset(new CefJavaScriptDialog(this,
                                        message_type,
--- a/libcef/browser/media_capture_devices_dispatcher.cc
+++ b/libcef/browser/media_capture_devices_dispatcher.cc
@@ -36,7 +36,7 @@ const content::MediaStreamDevice* FindDefaultDeviceWithId(

 CefMediaCaptureDevicesDispatcher*
    CefMediaCaptureDevicesDispatcher::GetInstance() {
-  return Singleton<CefMediaCaptureDevicesDispatcher>::get();
+  return base::Singleton<CefMediaCaptureDevicesDispatcher>::get();
 }

 CefMediaCaptureDevicesDispatcher::CefMediaCaptureDevicesDispatcher() {}
--- a/libcef/browser/media_capture_devices_dispatcher.h
+++ b/libcef/browser/media_capture_devices_dispatcher.h
@@ -55,7 +55,7 @@ class CefMediaCaptureDevicesDispatcher : public content::MediaObserver {
                              int render_view_id) override;

 private:
-  friend struct DefaultSingletonTraits<CefMediaCaptureDevicesDispatcher>;
+  friend struct base::DefaultSingletonTraits<CefMediaCaptureDevicesDispatcher>;

  CefMediaCaptureDevicesDispatcher();
  ~CefMediaCaptureDevicesDispatcher() override;
--- a/libcef/browser/permission_manager.cc
+++ b/libcef/browser/permission_manager.cc
@@ -12,6 +12,8 @@
 #include "base/callback.h"
 #include "content/public/browser/geolocation_provider.h"
 #include "content/public/browser/permission_type.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_process_host.h"

 namespace {

@@ -53,6 +55,22 @@ class CefGeolocationCallbackImpl : public CefGeolocationCallback {

 }  // namespace

+struct CefPermissionManager::PendingRequest {
+  PendingRequest(content::PermissionType permission,
+                 content::RenderFrameHost* render_frame_host,
+                 const GURL& requesting_origin)
+    : permission(permission),
+      render_process_id(render_frame_host->GetProcess()->GetID()),
+      render_frame_id(render_frame_host->GetRoutingID()),
+      requesting_origin(requesting_origin) {
+  }
+
+  content::PermissionType permission;
+  int render_process_id;
+  int render_frame_id;
+  GURL requesting_origin;
+};
+
 CefPermissionManager::CefPermissionManager()
    : PermissionManager() {
 }
@@ -60,10 +78,9 @@ CefPermissionManager::CefPermissionManager()
 CefPermissionManager::~CefPermissionManager() {
 }

-void CefPermissionManager::RequestPermission(
+int CefPermissionManager::RequestPermission(
    content::PermissionType permission,
    content::RenderFrameHost* render_frame_host,
-    int request_id,
    const GURL& requesting_origin,
    bool user_gesture,
    const base::Callback<void(content::PermissionStatus)>& callback) {
@@ -71,11 +88,15 @@ void CefPermissionManager::RequestPermission(

  if (permission != content::PermissionType::GEOLOCATION) {
    callback.Run(content::PERMISSION_STATUS_DENIED);
-    return;
+    return kNoPendingOperation;
  }

  bool proceed = false;

+  PendingRequest* pending_request = new PendingRequest(
+      permission, render_frame_host, requesting_origin);
+  const int request_id = pending_requests_.Add(pending_request);
+
  CefRefPtr<CefBrowserHostImpl> browser =
      CefBrowserHostImpl::GetBrowserForHost(render_frame_host);
  if (browser.get()) {
@@ -97,36 +118,45 @@ void CefPermissionManager::RequestPermission(
    }
  }

-  if (!proceed) {
-    // Disallow geolocation access by default.
-    callback.Run(content::PERMISSION_STATUS_DENIED);
-  }
+  if (proceed)
+    return request_id;
+
+  pending_requests_.Remove(request_id);
+
+  // Disallow geolocation access by default.
+  callback.Run(content::PERMISSION_STATUS_DENIED);
+  return kNoPendingOperation;
 }

 void CefPermissionManager::CancelPermissionRequest(
-    content::PermissionType permission,
-    content::RenderFrameHost* render_frame_host,
-    int request_id,
-    const GURL& requesting_origin) {
+    int request_id) {
  CEF_REQUIRE_UIT();

-  if (permission != content::PermissionType::GEOLOCATION)
+  PendingRequest* pending_request = pending_requests_.Lookup(request_id);
+  if (!pending_request)
+    return;
+
+  if (pending_request->permission != content::PermissionType::GEOLOCATION)
    return;

  CefRefPtr<CefBrowserHostImpl> browser =
-      CefBrowserHostImpl::GetBrowserForHost(render_frame_host);
+      CefBrowserHostImpl::GetBrowserForFrame(pending_request->render_process_id,
+                                             pending_request->render_frame_id);
  if (browser.get()) {
    CefRefPtr<CefClient> client = browser->GetClient();
    if (client.get()) {
      CefRefPtr<CefGeolocationHandler> handler =
          client->GetGeolocationHandler();
      if (handler.get()) {
-        handler->OnCancelGeolocationPermission(browser.get(),
-                                               requesting_origin.spec(),
-                                               request_id);
+        handler->OnCancelGeolocationPermission(
+            browser.get(),
+            pending_request->requesting_origin.spec(),
+            request_id);
      }
    }
  }
+
+  pending_requests_.Remove(request_id);
 }

 void CefPermissionManager::ResetPermission(
--- a/libcef/browser/permission_manager.h
+++ b/libcef/browser/permission_manager.h
@@ -6,6 +6,7 @@
 #define CEF_LIBCEF_BROWSER_PERMISSION_MANAGER_H_

 #include "base/callback_forward.h"
+#include "base/id_map.h"
 #include "base/macros.h"
 #include "content/public/browser/permission_manager.h"

@@ -15,17 +16,13 @@ class CefPermissionManager : public content::PermissionManager {
  ~CefPermissionManager() override;

  // PermissionManager implementation.
-  void RequestPermission(
+  int RequestPermission(
      content::PermissionType permission,
      content::RenderFrameHost* render_frame_host,
-      int request_id,
      const GURL& requesting_origin,
      bool user_gesture,
      const base::Callback<void(content::PermissionStatus)>& callback) override;
-  void CancelPermissionRequest(content::PermissionType permission,
-                               content::RenderFrameHost* render_frame_host,
-                               int request_id,
-                               const GURL& requesting_origin) override;
+  void CancelPermissionRequest(int request_id) override;
  void ResetPermission(content::PermissionType permission,
                       const GURL& requesting_origin,
                       const GURL& embedding_origin) override;
@@ -44,6 +41,10 @@ class CefPermissionManager : public content::PermissionManager {
  void UnsubscribePermissionStatusChange(int subscription_id) override;

 private:
+  struct PendingRequest;
+  using PendingRequestsMap = IDMap<PendingRequest, IDMapOwnPointer>;
+  PendingRequestsMap pending_requests_;
+
  DISALLOW_COPY_AND_ASSIGN(CefPermissionManager);
 };

--- a/libcef/browser/plugins/plugin_info_message_filter.cc
+++ b/libcef/browser/plugins/plugin_info_message_filter.cc
@@ -9,6 +9,7 @@
 #include "libcef/browser/plugins/plugin_service_filter.h"
 #include "libcef/browser/web_plugin_impl.h"
 #include "libcef/common/cef_messages.h"
+#include "libcef/common/extensions/extensions_util.h"

 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ -29,7 +30,6 @@
 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
-#include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/webview_info.h"
 #include "url/gurl.h"

@@ -130,17 +130,10 @@ bool IsPluginLoadingAccessibleResourceInWebView(
  }

  const std::string extension_id = resource.host();
-  const extensions::Extension* extension =
-      extension_registry->GetExtensionById(extension_id,
-                             extensions::ExtensionRegistry::ENABLED);
-  if (!extension)
-    return false;
-  const extensions::WebviewInfo* webview_info =
-      static_cast<const extensions::WebviewInfo*>(extension->GetManifestData(
-          extensions::manifest_keys::kWebviewAccessibleResources));
-  if (!webview_info ||
-      !webview_info->IsResourceWebviewAccessible(extension, partition_id,
-                                                 resource.path())) {
+  const extensions::Extension* extension = extension_registry->GetExtensionById(
+      extension_id, extensions::ExtensionRegistry::ENABLED);
+  if (!extension || !extensions::WebviewInfo::IsResourceWebviewAccessible(
+          extension, partition_id, resource.path())) {
    return false;
  }

@@ -159,10 +152,12 @@ CefPluginInfoMessageFilter::Context::Context(
    CefBrowserContext* profile)
    : render_process_id_(render_process_id),
      resource_context_(profile->GetResourceContext()),
-#if defined(ENABLE_EXTENSIONS)
-      extension_registry_(extensions::ExtensionRegistry::Get(profile)),
-#endif
      host_content_settings_map_(profile->GetHostContentSettingsMap()) {
+#if defined(ENABLE_EXTENSIONS)
+  if (extensions::ExtensionsEnabled())
+    extension_registry_ = extensions::ExtensionRegistry::Get(profile);
+#endif
+
  allow_outdated_plugins_.Init(prefs::kPluginsAllowOutdated,
                               profile->GetPrefs());
  allow_outdated_plugins_.MoveToThread(
@@ -387,7 +382,8 @@ void CefPluginInfoMessageFilter::Context::DecidePluginStatus(
  // If an app has explicitly made internal resources available by listing them
  // in |accessible_resources| in the manifest, then allow them to be loaded by
  // plugins inside a guest-view.
-  if (params.url.SchemeIs(extensions::kExtensionScheme) && !is_managed &&
+  if (extensions::ExtensionsEnabled() &&
+      params.url.SchemeIs(extensions::kExtensionScheme) && !is_managed &&
      plugin_setting == CONTENT_SETTING_BLOCK &&
      IsPluginLoadingAccessibleResourceInWebView(
          extension_registry_, render_process_id_, params.url)) {
@@ -405,18 +401,21 @@ void CefPluginInfoMessageFilter::Context::DecidePluginStatus(
                  : CefViewHostMsg_GetPluginInfo_Status::kBlocked;
  }

-  if (*status == CefViewHostMsg_GetPluginInfo_Status::kAllowed) {
-    // Allow an embedder of <webview> to block a plugin from being loaded inside
-    // the guest. In order to do this, set the status to 'Unauthorized' here,
-    // and update the status as appropriate depending on the response from the
-    // embedder.
 #if defined(ENABLE_EXTENSIONS)
+  // Allow an embedder of <webview> to block a plugin from being loaded inside
+  // the guest. In order to do this, set the status to 'Unauthorized' here,
+  // and update the status as appropriate depending on the response from the
+  // embedder.
+  if (*status == CefViewHostMsg_GetPluginInfo_Status::kAllowed ||
+      *status == CefViewHostMsg_GetPluginInfo_Status::kBlocked ||
+      *status ==
+          CefViewHostMsg_GetPluginInfo_Status::kPlayImportantContent) {
    if (extensions::WebViewRendererState::GetInstance()->IsGuest(
            render_process_id_)) {
      *status = CefViewHostMsg_GetPluginInfo_Status::kUnauthorized;
    }
-#endif
  }
+#endif
 }

 bool CefPluginInfoMessageFilter::Context::FindEnabledPlugin(
--- a/libcef/browser/printing/print_view_manager_base.cc
+++ b/libcef/browser/printing/print_view_manager_base.cc
@@ -42,11 +42,11 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
    : PrintManager(web_contents),
      printing_succeeded_(false),
      inside_inner_message_loop_(false),
+#if !defined(OS_MACOSX)
+      expecting_first_page_(true),
+#endif
      queue_(g_browser_process->print_job_manager()->queue()) {
  DCHECK(queue_.get());
-#if !defined(OS_MACOSX)
-  expecting_first_page_ = true;
-#endif  // OS_MACOSX
  PrefService* pref_service =
      static_cast<CefBrowserContext*>(web_contents->GetBrowserContext())->
          GetPrefs();
@@ -66,7 +66,7 @@ PrintViewManagerBase::~PrintViewManagerBase() {
 bool PrintViewManagerBase::PrintNow() {
  return PrintNowInternal(new PrintMsg_PrintPages(routing_id()));
 }
-#endif  // ENABLE_BASIC_PRINTING
+#endif

 void PrintViewManagerBase::UpdateScriptedPrintingBlocked() {
  Send(new PrintMsg_SetScriptedPrintingBlocked(
@@ -125,27 +125,51 @@ void PrintViewManagerBase::OnDidPrintPage(
 #else
  const bool metafile_must_be_valid = expecting_first_page_;
  expecting_first_page_ = false;
-#endif  // OS_MACOSX
+#endif

-  base::SharedMemory shared_buf(params.metafile_data_handle, true);
+  // Only used when |metafile_must_be_valid| is true.
+  scoped_ptr<base::SharedMemory> shared_buf;
  if (metafile_must_be_valid) {
-    if (!shared_buf.Map(params.data_size)) {
+    if (!base::SharedMemory::IsHandleValid(params.metafile_data_handle)) {
+      NOTREACHED() << "invalid memory handle";
+      web_contents()->Stop();
+      return;
+    }
+    shared_buf.reset(new base::SharedMemory(params.metafile_data_handle, true));
+    if (!shared_buf->Map(params.data_size)) {
      NOTREACHED() << "couldn't map";
      web_contents()->Stop();
      return;
    }
+  } else {
+    if (base::SharedMemory::IsHandleValid(params.metafile_data_handle)) {
+      NOTREACHED() << "unexpected valid memory handle";
+      web_contents()->Stop();
+      base::SharedMemory::CloseHandle(params.metafile_data_handle);
+      return;
+    }
  }

  scoped_ptr<PdfMetafileSkia> metafile(new PdfMetafileSkia);
  if (metafile_must_be_valid) {
-    if (!metafile->InitFromData(shared_buf.memory(), params.data_size)) {
+    if (!metafile->InitFromData(shared_buf->memory(), params.data_size)) {
      NOTREACHED() << "Invalid metafile header";
      web_contents()->Stop();
      return;
    }
  }

-#if !defined(OS_WIN)
+#if defined(OS_WIN)
+  if (metafile_must_be_valid) {
+    scoped_refptr<base::RefCountedBytes> bytes = new base::RefCountedBytes(
+        reinterpret_cast<const unsigned char*>(shared_buf->memory()),
+        params.data_size);
+
+    document->DebugDumpData(bytes.get(), FILE_PATH_LITERAL(".pdf"));
+    print_job_->StartPdfToEmfConversion(
+        bytes, params.page_size, params.content_area);
+  }
+#else
  // Update the rendered document. It will send notifications to the listener.
  document->SetPage(params.page_number,
                    metafile.Pass(),
@@ -153,17 +177,7 @@ void PrintViewManagerBase::OnDidPrintPage(
                    params.content_area);

  ShouldQuitFromInnerMessageLoop();
-#else
-  if (metafile_must_be_valid) {
-    scoped_refptr<base::RefCountedBytes> bytes = new base::RefCountedBytes(
-        reinterpret_cast<const unsigned char*>(shared_buf.memory()),
-        params.data_size);
-
-    document->DebugDumpData(bytes.get(), FILE_PATH_LITERAL(".pdf"));
-    print_job_->StartPdfToEmfConversion(
-        bytes, params.page_size, params.content_area);
-  }
-#endif  // !OS_WIN
+#endif
 }

 void PrintViewManagerBase::OnPrintingFailed(int cookie) {
@@ -354,7 +368,7 @@ void PrintViewManagerBase::DisconnectFromCurrentPrintJob() {
  }
 #if !defined(OS_MACOSX)
  expecting_first_page_ = true;
-#endif  // OS_MACOSX
+#endif
 }

 void PrintViewManagerBase::PrintingDone(bool success) {
@@ -409,7 +423,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
  // be CPU bound, the page overly complex/large or the system just
  // memory-bound.
  static const int kPrinterSettingsTimeout = 60000;
-  base::OneShotTimer<base::MessageLoop> quit_timer;
+  base::OneShotTimer quit_timer;
  quit_timer.Start(FROM_HERE,
                   TimeDelta::FromMilliseconds(kPrinterSettingsTimeout),
                   base::MessageLoop::current(), &base::MessageLoop::Quit);
--- a/libcef/browser/render_widget_host_view_osr.cc
+++ b/libcef/browser/render_widget_host_view_osr.cc
@@ -472,9 +472,9 @@ CefRenderWidgetHostViewOSR::CefRenderWidgetHostViewOSR(
 #if !defined(OS_MACOSX)
  // On OS X the ui::Compositor is created/owned by the platform view.
  compositor_.reset(
-      new ui::Compositor(compositor_widget_,
-                         content::GetContextFactory(),
+      new ui::Compositor(content::GetContextFactory(),
                         base::ThreadTaskRunnerHandle::Get()));
+  compositor_->SetAcceleratedWidgetAndStartCompositor(compositor_widget_);
 #endif
  compositor_->SetDelegate(this);
  compositor_->SetRootLayer(root_layer_.get());
@@ -670,7 +670,8 @@ void CefRenderWidgetHostViewOSR::OnSwapCompositorFrame(
      cc::RenderPass* root_pass =
          frame->delegated_frame_data->render_pass_list.back();
      gfx::Size frame_size = root_pass->output_rect.size();
-      gfx::Rect damage_rect = gfx::ToEnclosingRect(root_pass->damage_rect);
+      gfx::Rect damage_rect =
+          gfx::ToEnclosingRect(gfx::RectF(root_pass->damage_rect));
      damage_rect.Intersect(gfx::Rect(frame_size));

      delegated_frame_host_->SwapDelegatedFrame(
@@ -689,6 +690,10 @@ void CefRenderWidgetHostViewOSR::OnSwapCompositorFrame(
  }
 }

+void CefRenderWidgetHostViewOSR::ClearCompositorFrame() {
+  delegated_frame_host_->ClearDelegatedFrame();
+}
+
 void CefRenderWidgetHostViewOSR::InitAsPopup(
    content::RenderWidgetHostView* parent_host_view,
    const gfx::Rect& pos) {
@@ -830,12 +835,6 @@ void CefRenderWidgetHostViewOSR::SetTooltipText(
  }
 }

-void CefRenderWidgetHostViewOSR::SelectionChanged(
-    const base::string16& text,
-    size_t offset,
-    const gfx::Range& range) {
-}
-
 gfx::Size CefRenderWidgetHostViewOSR::GetRequestedRendererSize() const {
  return delegated_frame_host_->GetRequestedRendererSize();
 }
@@ -844,14 +843,16 @@ gfx::Size CefRenderWidgetHostViewOSR::GetPhysicalBackingSize() const {
  return gfx::ConvertSizeToPixel(scale_factor_, GetRequestedRendererSize());
 }

+#if !defined(OS_MACOSX)
 void CefRenderWidgetHostViewOSR::SelectionBoundsChanged(
    const ViewHostMsg_SelectionBounds_Params& params) {
 }
+#endif

 void CefRenderWidgetHostViewOSR::CopyFromCompositingSurface(
    const gfx::Rect& src_subrect,
    const gfx::Size& dst_size,
-    content::ReadbackRequestCallback& callback,
+    const content::ReadbackRequestCallback& callback,
    const SkColorType color_type) {
  delegated_frame_host_->CopyFromCompositingSurface(
      src_subrect, dst_size, callback, color_type);
@@ -869,10 +870,6 @@ bool CefRenderWidgetHostViewOSR::CanCopyToVideoFrame() const {
  return delegated_frame_host_->CanCopyToVideoFrame();
 }

-bool CefRenderWidgetHostViewOSR::CanSubscribeFrame() const {
-  return delegated_frame_host_->CanSubscribeFrame();
-}
-
 void CefRenderWidgetHostViewOSR::BeginFrameSubscription(
    scoped_ptr<content::RenderWidgetHostViewFrameSubscriber> subscriber) {
  delegated_frame_host_->BeginFrameSubscription(subscriber.Pass());
@@ -882,10 +879,6 @@ void CefRenderWidgetHostViewOSR::EndFrameSubscription() {
  delegated_frame_host_->EndFrameSubscription();
 }

-void CefRenderWidgetHostViewOSR::AcceleratedSurfaceInitialized(
-    int route_id) {
-}
-
 bool CefRenderWidgetHostViewOSR::HasAcceleratedSurface(
    const gfx::Size& desired_size) {
  // CEF doesn't use GetBackingStore for accelerated pages, so it doesn't
@@ -929,6 +922,13 @@ void CefRenderWidgetHostViewOSR::GetScreenInfo(blink::WebScreenInfo* results) {
  *results = webScreenInfoFrom(screen_info);
 }

+bool CefRenderWidgetHostViewOSR::GetScreenColorProfile(
+    std::vector<char>* color_profile) {
+  DCHECK(color_profile->empty());
+  // TODO(cef): Maybe expose this method to the client?
+  return false;
+}
+
 gfx::Rect CefRenderWidgetHostViewOSR::GetBoundsInRootWindow() {
  if (!browser_impl_.get())
    return gfx::Rect();
@@ -941,11 +941,6 @@ gfx::Rect CefRenderWidgetHostViewOSR::GetBoundsInRootWindow() {
  return gfx::Rect();
 }

-gfx::GLSurfaceHandle CefRenderWidgetHostViewOSR::GetCompositingSurface() {
-  return content::ImageTransportFactory::GetInstance()->
-      GetSharedSurfaceHandle();
-}
-
 content::BrowserAccessibilityManager*
    CefRenderWidgetHostViewOSR::CreateBrowserAccessibilityManager(
        content::BrowserAccessibilityDelegate* delegate) {
--- a/libcef/browser/render_widget_host_view_osr.h
+++ b/libcef/browser/render_widget_host_view_osr.h
@@ -119,6 +119,7 @@ class CefRenderWidgetHostViewOSR
  void OnSwapCompositorFrame(
      uint32 output_surface_id,
      scoped_ptr<cc::CompositorFrame> frame) override;
+  void ClearCompositorFrame() override;
  void InitAsPopup(content::RenderWidgetHostView* parent_host_view,
                   const gfx::Rect& pos) override;
  void InitAsFullscreen(
@@ -134,9 +135,13 @@ class CefRenderWidgetHostViewOSR
                         int error_code) override;
  void Destroy() override;
  void SetTooltipText(const base::string16& tooltip_text) override;
+
+#if defined(OS_MACOSX)
  void SelectionChanged(const base::string16& text,
                        size_t offset,
                        const gfx::Range& range) override;
+#endif
+
  gfx::Size GetRequestedRendererSize() const override;
  gfx::Size GetPhysicalBackingSize() const override;
  void SelectionBoundsChanged(
@@ -144,23 +149,21 @@ class CefRenderWidgetHostViewOSR
  void CopyFromCompositingSurface(
      const gfx::Rect& src_subrect,
      const gfx::Size& dst_size,
-      content::ReadbackRequestCallback& callback,
+      const content::ReadbackRequestCallback& callback,
      const SkColorType color_type) override;
  void CopyFromCompositingSurfaceToVideoFrame(
      const gfx::Rect& src_subrect,
      const scoped_refptr<media::VideoFrame>& target,
      const base::Callback<void(bool)>& callback) override;
  bool CanCopyToVideoFrame() const override;
-  bool CanSubscribeFrame() const override;
  void BeginFrameSubscription(
      scoped_ptr<content::RenderWidgetHostViewFrameSubscriber> subscriber)
      override;
  void EndFrameSubscription() override;
-  void AcceleratedSurfaceInitialized(int route_id) override;
  bool HasAcceleratedSurface(const gfx::Size& desired_size) override;
  void GetScreenInfo(blink::WebScreenInfo* results) override;
+  bool GetScreenColorProfile(std::vector<char>* color_profile) override;
  gfx::Rect GetBoundsInRootWindow() override;
-  gfx::GLSurfaceHandle GetCompositingSurface() override;
  content::BrowserAccessibilityManager*
      CreateBrowserAccessibilityManager(
          content::BrowserAccessibilityDelegate* delegate) override;
@@ -256,6 +259,11 @@ class CefRenderWidgetHostViewOSR

  bool GetCachedFirstRectForCharacterRange(gfx::Range range, gfx::Rect* rect,
                                           gfx::Range* actual_range) const;
+
+  const std::string& selected_text() const { return selected_text_; }
+  const gfx::Range& composition_range() const { return composition_range_; }
+  const base::string16& selection_text() const { return selection_text_; }
+  size_t selection_text_offset() const { return selection_text_offset_; }
 #endif  // defined(OS_MACOSX)

  void AddGuestHostView(CefRenderWidgetHostViewOSR* guest_host);
@@ -376,6 +384,19 @@ class CefRenderWidgetHostViewOSR

 #if defined(OS_MACOSX)
  NSTextInputContext* text_input_context_osr_mac_;
+
+  // Selected text on the renderer.
+  std::string selected_text_;
+
+  // The current composition character range and its bounds.
+  gfx::Range composition_range_;
+  std::vector<gfx::Rect> composition_bounds_;
+
+  // The current caret bounds.
+  gfx::Rect caret_rect_;
+
+  // The current first selection bounds.
+  gfx::Rect first_selection_rect_;
 #endif

  base::WeakPtrFactory<CefRenderWidgetHostViewOSR> weak_ptr_factory_;
--- a/libcef/browser/render_widget_host_view_osr_mac.mm
+++ b/libcef/browser/render_widget_host_view_osr_mac.mm
@@ -11,6 +11,8 @@
 #include "libcef/browser/text_input_client_osr_mac.h"

 #include "base/compiler_specific.h"
+#include "base/strings/utf_string_conversions.h"
+#include "content/common/view_messages.h"
 #include "ui/events/latency_info.h"

 namespace {
@@ -79,9 +81,36 @@ void CefRenderWidgetHostViewOSR::ImeCompositionRangeChanged(
  if (!client)
    return;

-  client->markedRange_ = range.ToNSRange();
-  client->composition_range_ = range;
-  client->composition_bounds_ = character_bounds;
+  composition_range_ = range;
+  composition_bounds_ = character_bounds;
+}
+
+void CefRenderWidgetHostViewOSR::SelectionChanged(
+    const base::string16& text,
+    size_t offset,
+    const gfx::Range& range) {
+  if (range.is_empty() || text.empty()) {
+    selected_text_.clear();
+  } else {
+    size_t pos = range.GetMin() - offset;
+    size_t n = range.length();
+
+    DCHECK(pos + n <= text.length()) << "The text can not fully cover range.";
+    if (pos >= text.length()) {
+      DCHECK(false) << "The text can not cover range.";
+      return;
+    }
+    selected_text_ = base::UTF16ToUTF8(text.substr(pos, n));
+  }
+
+  RenderWidgetHostViewBase::SelectionChanged(text, offset, range);
+}
+
+void CefRenderWidgetHostViewOSR::SelectionBoundsChanged(
+    const ViewHostMsg_SelectionBounds_Params& params) {
+  if (params.anchor_rect == params.focus_rect)
+    caret_rect_ = params.anchor_rect;
+  first_selection_rect_ = params.anchor_rect;
 }

 NSView* CefRenderWidgetHostViewOSR::AcceleratedWidgetGetNSView() const {
@@ -147,99 +176,98 @@ void CefRenderWidgetHostViewOSR::HandleKeyEventAfterTextInputClient(
 bool CefRenderWidgetHostViewOSR::GetCachedFirstRectForCharacterRange(
    gfx::Range range, gfx::Rect* rect, gfx::Range* actual_range) const {
  DCHECK(rect);
-  CefTextInputClientOSRMac* client = GetInputClientFromContext(
-     text_input_context_osr_mac_);

+  const gfx::Range requested_range(range);
  // If requested range is same as caret location, we can just return it.
-  if (selection_range_.is_empty() && gfx::Range(range) == selection_range_) {
+  if (selection_range_.is_empty() && requested_range == selection_range_) {
    if (actual_range)
      *actual_range = range;
-    *rect = client->caret_rect_;
+    *rect = caret_rect_;
+    return true;
+  }
+
+  if (composition_range_.is_empty()) {
+    if (!selection_range_.Contains(requested_range))
+      return false;
+    if (actual_range)
+      *actual_range = selection_range_;
+    *rect = first_selection_rect_;
    return true;
  }

  const gfx::Range request_range_in_composition =
-      ConvertCharacterRangeToCompositionRange(gfx::Range(range));
+      ConvertCharacterRangeToCompositionRange(requested_range);
  if (request_range_in_composition == gfx::Range::InvalidRange())
    return false;

  // If firstRectForCharacterRange in WebFrame is failed in renderer,
  // ImeCompositionRangeChanged will be sent with empty vector.
-  if (client->composition_bounds_.empty())
+  if (composition_bounds_.empty())
    return false;
-
-  DCHECK_EQ(client->composition_bounds_.size(),
-      client->composition_range_.length());
+  DCHECK_EQ(composition_bounds_.size(), composition_range_.length());

  gfx::Range ui_actual_range;
  *rect = GetFirstRectForCompositionRange(request_range_in_composition,
                                          &ui_actual_range);
  if (actual_range) {
    *actual_range = gfx::Range(
-        client->composition_range_.start() + ui_actual_range.start(),
-        client->composition_range_.start() + ui_actual_range.end()).ToNSRange();
+        composition_range_.start() + ui_actual_range.start(),
+        composition_range_.start() + ui_actual_range.end());
  }
  return true;
 }

 gfx::Rect CefRenderWidgetHostViewOSR::GetFirstRectForCompositionRange(
    const gfx::Range& range, gfx::Range* actual_range) const {
-  CefTextInputClientOSRMac* client = GetInputClientFromContext(
-     text_input_context_osr_mac_);
-
-  DCHECK(client);
  DCHECK(actual_range);
-  DCHECK(!client->composition_bounds_.empty());
-  DCHECK_LE(range.start(), client->composition_bounds_.size());
-  DCHECK_LE(range.end(), client->composition_bounds_.size());
+  DCHECK(!composition_bounds_.empty());
+  DCHECK(range.start() <= composition_bounds_.size());
+  DCHECK(range.end() <= composition_bounds_.size());

  if (range.is_empty()) {
    *actual_range = range;
-    if (range.start() == client->composition_bounds_.size()) {
-      return gfx::Rect(client->composition_bounds_[range.start() - 1].right(),
-                       client->composition_bounds_[range.start() - 1].y(),
+    if (range.start() == composition_bounds_.size()) {
+      return gfx::Rect(composition_bounds_[range.start() - 1].right(),
+                       composition_bounds_[range.start() - 1].y(),
                       0,
-                       client->composition_bounds_[range.start() - 1].height());
+                       composition_bounds_[range.start() - 1].height());
    } else {
-      return gfx::Rect(client->composition_bounds_[range.start()].x(),
-                       client->composition_bounds_[range.start()].y(),
+      return gfx::Rect(composition_bounds_[range.start()].x(),
+                       composition_bounds_[range.start()].y(),
                       0,
-                       client->composition_bounds_[range.start()].height());
+                       composition_bounds_[range.start()].height());
    }
  }

  size_t end_idx;
-  if (!GetLineBreakIndex(client->composition_bounds_,
-      range, &end_idx)) {
+  if (!GetLineBreakIndex(composition_bounds_, range, &end_idx)) {
    end_idx = range.end();
  }
  *actual_range = gfx::Range(range.start(), end_idx);
-  gfx::Rect rect = client->composition_bounds_[range.start()];
+  gfx::Rect rect = composition_bounds_[range.start()];
  for (size_t i = range.start() + 1; i < end_idx; ++i) {
-    rect.Union(client->composition_bounds_[i]);
+    rect.Union(composition_bounds_[i]);
  }
  return rect;
 }

 gfx::Range CefRenderWidgetHostViewOSR::ConvertCharacterRangeToCompositionRange(
    const gfx::Range& request_range) const {
-  CefTextInputClientOSRMac* client = GetInputClientFromContext(
-     text_input_context_osr_mac_);
-  DCHECK(client);
-
-  if (client->composition_range_.is_empty())
+  if (composition_range_.is_empty())
    return gfx::Range::InvalidRange();

  if (request_range.is_reversed())
    return gfx::Range::InvalidRange();

-  if (request_range.start() < client->composition_range_.start()
-      || request_range.start() > client->composition_range_.end()
-      || request_range.end() > client->composition_range_.end())
+  if (request_range.start() < composition_range_.start() ||
+      request_range.start() > composition_range_.end() ||
+      request_range.end() > composition_range_.end()) {
    return gfx::Range::InvalidRange();
+  }

-  return gfx::Range(request_range.start() - client->composition_range_.start(),
-                    request_range.end() - client->composition_range_.start());
+  return gfx::Range(
+      request_range.start() - composition_range_.start(),
+      request_range.end() - composition_range_.start());
 }

 bool CefRenderWidgetHostViewOSR::GetLineBreakIndex(
--- a/libcef/browser/resource_dispatcher_host_delegate.cc
+++ b/libcef/browser/resource_dispatcher_host_delegate.cc
@@ -9,13 +9,10 @@
 #include "libcef/browser/origin_whitelist_impl.h"
 #include "libcef/browser/resource_context.h"
 #include "libcef/browser/thread_util.h"
-#include "libcef/common/request_impl.h"
 #include "libcef/common/extensions/extensions_util.h"

 #include "base/guid.h"
 #include "base/memory/scoped_vector.h"
-#include "components/navigation_interception/intercept_navigation_resource_throttle.h"
-#include "components/navigation_interception/navigation_params.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/plugin_service_filter.h"
 #include "content/public/browser/resource_request_info.h"
@@ -30,37 +27,6 @@

 namespace {

-bool NavigationOnUIThread(
-    int64 frame_id,
-    CefRefPtr<CefRequestImpl> request,
-    content::WebContents* source,
-    const navigation_interception::NavigationParams& params) {
-  CEF_REQUIRE_UIT();
-
-  bool ignore_navigation = false;
-
-  CefRefPtr<CefBrowserHostImpl> browser =
-      CefBrowserHostImpl::GetBrowserForContents(source);
-  if (browser.get()) {
-    CefRefPtr<CefClient> client = browser->GetClient();
-    if (client.get()) {
-      CefRefPtr<CefRequestHandler> handler = client->GetRequestHandler();
-      if (handler.get()) {
-        CefRefPtr<CefFrame> frame;
-        if (frame_id >= 0)
-          frame = browser->GetFrame(frame_id);
-        DCHECK(frame.get());
-        if (frame.get()) {
-          ignore_navigation = handler->OnBeforeBrowse(
-              browser.get(), frame, request.get(), params.is_redirect());
-        }
-      }
-    }
-  }
-
-  return ignore_navigation;
-}
-
 void SendExecuteMimeTypeHandlerEvent(scoped_ptr<content::StreamInfo> stream,
                                     int64 expected_content_size,
                                     int render_process_id,
@@ -105,37 +71,6 @@ CefResourceDispatcherHostDelegate::CefResourceDispatcherHostDelegate() {
 CefResourceDispatcherHostDelegate::~CefResourceDispatcherHostDelegate() {
 }

-void CefResourceDispatcherHostDelegate::RequestBeginning(
-    net::URLRequest* request,
-    content::ResourceContext* resource_context,
-    content::AppCacheService* appcache_service,
-    content::ResourceType resource_type,
-    ScopedVector<content::ResourceThrottle>* throttles) {
-  if (resource_type == content::ResourceType::RESOURCE_TYPE_MAIN_FRAME ||
-      resource_type == content::ResourceType::RESOURCE_TYPE_SUB_FRAME) {
-    int64 frame_id = -1;
-
-    // ResourceRequestInfo will not exist for requests originating from
-    // WebURLLoader in the render process.
-    const content::ResourceRequestInfo* info =
-        content::ResourceRequestInfo::ForRequest(request);
-    if (info)
-      frame_id = info->GetRenderFrameID();
-
-    if (frame_id >= 0) {
-      CefRefPtr<CefRequestImpl> cef_request(new CefRequestImpl);
-      cef_request->Set(request);
-      cef_request->SetReadOnly(true);
-
-      content::ResourceThrottle* throttle =
-        new navigation_interception::InterceptNavigationResourceThrottle(
-            request,
-            base::Bind(&NavigationOnUIThread, frame_id, cef_request));
-      throttles->push_back(throttle);
-    }
-  }
-}
-
 bool CefResourceDispatcherHostDelegate::HandleExternalProtocol(
    const GURL& url,
    int child_id,
--- a/libcef/browser/resource_dispatcher_host_delegate.h
+++ b/libcef/browser/resource_dispatcher_host_delegate.h
@@ -20,12 +20,6 @@ class CefResourceDispatcherHostDelegate
  ~CefResourceDispatcherHostDelegate() override;

  // ResourceDispatcherHostDelegate methods.
-  void RequestBeginning(
-      net::URLRequest* request,
-      content::ResourceContext* resource_context,
-      content::AppCacheService* appcache_service,
-      content::ResourceType resource_type,
-      ScopedVector<content::ResourceThrottle>* throttles) override;
  bool HandleExternalProtocol(const GURL& url,
                              int child_id,
                              int route_id,
--- a/libcef/browser/text_input_client_osr_mac.h
+++ b/libcef/browser/text_input_client_osr_mac.h
@@ -21,19 +21,6 @@
 // mac when window rendering is disabled.

@interface CefTextInputClientOSRMac : NSObject<NSTextInputClient> {
-
- @public
-  // The range of current marked text inside the whole content of the DOM node
-  // being edited.
-  NSRange markedRange_;
-
-  // The current composition character range and its bounds.
-  gfx::Range composition_range_;
-  std::vector<gfx::Rect> composition_bounds_;
-
-  // The current caret bounds.
-  gfx::Rect caret_rect_;
-
 @private
  // Represents the input-method attributes supported by this object.
  base::scoped_nsobject<NSArray> validAttributesForMarkedText_;
--- a/libcef/browser/text_input_client_osr_mac.mm
+++ b/libcef/browser/text_input_client_osr_mac.mm
@@ -5,6 +5,7 @@
 #include "libcef/browser/text_input_client_osr_mac.h"
 #include "libcef/browser/browser_host_impl.h"

+#include "base/numerics/safe_conversions.h"
 #include "base/strings/sys_string_conversions.h"
 #import "content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h"
 #import "content/browser/renderer_host/text_input_client_mac.h"
@@ -81,7 +82,9 @@ extern "C" {
 }

 - (NSRange)markedRange {
-  return hasMarkedText_ ? markedRange_ : NSMakeRange(NSNotFound, 0);
+  return hasMarkedText_ ?
+      renderWidgetHostView_->composition_range().ToNSRange() :
+      NSMakeRange(NSNotFound, 0);
 }

 - (BOOL)hasMarkedText {
@@ -192,10 +195,40 @@ extern "C" {
    actualRange:(NSRangePointer)actualRange {
  if (actualRange)
    *actualRange = range;
-  NSAttributedString* str = content::TextInputClientMac::GetInstance()->
-      GetAttributedSubstringFromRange(
-          renderWidgetHostView_->GetRenderWidgetHost(), range);
-  return str;
+
+  const gfx::Range requested_range(range);
+  if (requested_range.is_reversed())
+    return nil;
+
+  gfx::Range expected_range;
+  const base::string16* expected_text;
+
+  if (!renderWidgetHostView_->composition_range().is_empty()) {
+    expected_text = &markedText_;
+    expected_range = renderWidgetHostView_->composition_range();
+  } else {
+    expected_text = &renderWidgetHostView_->selection_text();
+    size_t offset = renderWidgetHostView_->selection_text_offset();
+    expected_range = gfx::Range(offset, offset + expected_text->size());
+  }
+
+  if (!expected_range.Contains(requested_range))
+    return nil;
+
+  // Gets the raw bytes to avoid unnecessary string copies for generating
+  // NSString.
+  const base::char16* bytes =
+      &(*expected_text)[requested_range.start() - expected_range.start()];
+  // Avoid integer overflow.
+  base::CheckedNumeric<size_t> requested_len = requested_range.length();
+  requested_len *= sizeof(base::char16);
+  NSUInteger bytes_len = base::strict_cast<NSUInteger, size_t>(
+      requested_len.ValueOrDefault(0));
+  base::scoped_nsobject<NSString> ns_string(
+      [[NSString alloc] initWithBytes:bytes
+                               length:bytes_len
+                             encoding:NSUTF16LittleEndianStringEncoding]);
+  return [[[NSAttributedString alloc] initWithString:ns_string] autorelease];
 }

 - (NSRect)firstViewRectForCharacterRange:(NSRange)theRange
--- a/libcef/browser/url_request_context_getter_impl.cc
+++ b/libcef/browser/url_request_context_getter_impl.cc
@@ -53,8 +53,8 @@
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_job_manager.h"

-#if defined(USE_NSS)
-#include "net/ocsp/nss_ocsp.h"
+#if defined(USE_NSS_CERTS)
+#include "net/cert_net/nss_ocsp.h"
 #endif

 using content::BrowserThread;
@@ -140,7 +140,8 @@ net::URLRequestContext* CefURLRequestContextGetterImpl::GetURLRequestContext() {
    SetCookieStoragePath(cache_path,
                         settings_.persist_session_cookies ? true : false);

-    storage_->set_network_delegate(new CefNetworkDelegate);
+    storage_->set_network_delegate(
+        make_scoped_ptr<net::NetworkDelegate>(new CefNetworkDelegate));

    storage_->set_channel_id_service(make_scoped_ptr(
        new net::ChannelIDService(
@@ -151,22 +152,23 @@ net::URLRequestContext* CefURLRequestContextGetterImpl::GetURLRequestContext() {
        settings_.accept_language_list.length > 0 ?
            CefString(&settings_.accept_language_list): "en-US,en";
    storage_->set_http_user_agent_settings(
-        new CefHttpUserAgentSettings(accept_language));
+        make_scoped_ptr<net::HttpUserAgentSettings>(
+            new CefHttpUserAgentSettings(accept_language)));

    storage_->set_host_resolver(net::HostResolver::CreateDefaultResolver(NULL));
    storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
-    storage_->set_transport_security_state(new net::TransportSecurityState);
+    storage_->set_transport_security_state(
+        make_scoped_ptr(new net::TransportSecurityState));

-    scoped_ptr<net::ProxyService> system_proxy_service;
-    system_proxy_service.reset(
+    scoped_ptr<net::ProxyService> system_proxy_service =
        ProxyServiceFactory::CreateProxyService(
            NULL,
            url_request_context_.get(),
            url_request_context_->network_delegate(),
-            proxy_config_service_.release(),
+            proxy_config_service_.Pass(),
            *command_line,
-            true));
-    storage_->set_proxy_service(system_proxy_service.release());
+            true);
+    storage_->set_proxy_service(system_proxy_service.Pass());

    storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);

@@ -179,7 +181,7 @@ net::URLRequestContext* CefURLRequestContextGetterImpl::GetURLRequestContext() {
    supported_schemes.push_back("ntlm");
    supported_schemes.push_back("negotiate");

-    storage_->set_http_auth_handler_factory(
+    storage_->set_http_auth_handler_factory(make_scoped_ptr(
        net::HttpAuthHandlerRegistryFactory::Create(
            supported_schemes,
            url_security_manager_.get(),
@@ -187,7 +189,7 @@ net::URLRequestContext* CefURLRequestContextGetterImpl::GetURLRequestContext() {
            std::string(),
            std::string(),
            false,
-            false));
+            false)));
    storage_->set_http_server_properties(
        make_scoped_ptr<net::HttpServerProperties>(
            new net::HttpServerPropertiesImpl));
@@ -223,9 +225,10 @@ net::URLRequestContext* CefURLRequestContextGetterImpl::GetURLRequestContext() {
    network_session_params.ignore_certificate_errors =
        settings_.ignore_certificate_errors ? true : false;

-    net::HttpCache* main_cache = new net::HttpCache(network_session_params,
-                                                    main_backend);
-    storage_->set_http_transaction_factory(main_cache);
+    scoped_ptr<net::HttpCache> main_cache(
+        new net::HttpCache(network_session_params,
+                           main_backend));
+    storage_->set_http_transaction_factory(main_cache.Pass());

 #if !defined(DISABLE_FTP_SUPPORT)
    ftp_transaction_factory_.reset(
@@ -260,9 +263,9 @@ net::URLRequestContext* CefURLRequestContextGetterImpl::GetURLRequestContext() {
    }
    request_interceptors_.weak_clear();

-    storage_->set_job_factory(top_job_factory.release());
+    storage_->set_job_factory(top_job_factory.Pass());

-#if defined(USE_NSS)
+#if defined(USE_NSS_CERTS)
    // Only do this for the first (global) request context.
    static bool request_context_for_nss_set = false;
    if (!request_context_for_nss_set) {
@@ -359,7 +362,7 @@ void CefURLRequestContextGetterImpl::CreateProxyConfigService() {
  if (proxy_config_service_.get())
    return;

-  proxy_config_service_.reset(
+  proxy_config_service_ =
      net::ProxyService::CreateSystemProxyConfigService(
-          io_loop_->task_runner(), file_loop_->task_runner()));
+          io_loop_->task_runner(), file_loop_->task_runner());
 }
--- a/libcef/common/crash_reporter_client.h
+++ b/libcef/common/crash_reporter_client.h
@@ -6,7 +6,7 @@
 #define CEF_LIBCEF_COMMON_CRASH_REPORTER_CLIENT_H_

 #include "base/compiler_specific.h"
-#include "components/crash/app/crash_reporter_client.h"
+#include "components/crash/content/app/crash_reporter_client.h"

 class CefCrashReporterClient : public crash_reporter::CrashReporterClient {
 public:
--- a/libcef/common/extensions/extensions_client.cc
+++ b/libcef/common/extensions/extensions_client.cc
@@ -45,13 +45,13 @@ class CefPermissionMessageProvider : public PermissionMessageProvider {
  ~CefPermissionMessageProvider() override {}

  // PermissionMessageProvider implementation.
-  CoalescedPermissionMessages GetPermissionMessages(
+  PermissionMessages GetPermissionMessages(
      const PermissionIDSet& permissions) const override {
-    return CoalescedPermissionMessages();
+    return PermissionMessages();
  }

-  bool IsPrivilegeIncrease(const PermissionSet* old_permissions,
-                           const PermissionSet* new_permissions,
+  bool IsPrivilegeIncrease(const PermissionSet& old_permissions,
+                           const PermissionSet& new_permissions,
                           Manifest::Type extension_type) const override {
    // Ensure we implement this before shipping.
    CHECK(false);
@@ -59,7 +59,7 @@ class CefPermissionMessageProvider : public PermissionMessageProvider {
  }

  PermissionIDSet GetAllPermissionIDs(
-      const PermissionSet* permissions,
+      const PermissionSet& permissions,
      Manifest::Type extension_type) const override {
    return PermissionIDSet();
  }
--- a/libcef/common/main_delegate.cc
+++ b/libcef/common/main_delegate.cc
@@ -54,7 +54,7 @@
 #if defined(OS_WIN)
 #include <Objbase.h>  // NOLINT(build/include_order)
 #include "base/win/registry.h"
-#include "components/crash/app/breakpad_win.h"
+#include "components/crash/content/app/breakpad_win.h"
 #endif

 #if defined(OS_MACOSX)
@@ -62,12 +62,12 @@
 #include "base/mac/os_crash_dumps.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
-#include "components/crash/app/breakpad_mac.h"
+#include "components/crash/content/app/breakpad_mac.h"
 #include "content/public/common/content_paths.h"
 #endif

 #if defined(OS_POSIX) && !defined(OS_MACOSX)
-#include "components/crash/app/breakpad_linux.h"
+#include "components/crash/content/app/breakpad_linux.h"
 #endif

 #if defined(OS_LINUX)
@@ -430,13 +430,6 @@ bool CefMainDelegate::BasicStartupComplete(int* exit_code) {
      command_line->AppendSwitchASCII(switches::kContextSafetyImplementation,
          base::IntToString(settings.context_safety_implementation));
    }
-
-    if (settings.windowless_rendering_enabled) {
-#if defined(OS_MACOSX)
-      // The delegated renderer is not yet enabled by default on OS X.
-      command_line->AppendSwitch(switches::kEnableDelegatedRenderer);
-#endif
-    }
  }

  if (content_client_.application().get()) {
--- a/libcef/common/parser_impl.cc
+++ b/libcef/common/parser_impl.cc
@@ -9,6 +9,7 @@

 #include "base/base64.h"
 #include "base/threading/thread_restrictions.h"
+#include "components/url_formatter/elide_url.h"
 #include "net/base/escape.h"
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/public/platform/WebString.h"
@@ -76,6 +77,12 @@ bool CefCreateURL(const CefURLParts& parts,
  return false;
 }

+CefString CefFormatUrlForSecurityDisplay(const CefString& origin_url,
+                                         const CefString& languages) {
+  return url_formatter::FormatUrlForSecurityDisplay(
+      GURL(origin_url.ToString()), languages);
+}
+
 CefString CefGetMimeType(const CefString& extension) {
  // Requests should not block on the disk!  On POSIX this goes to disk.
  // http://code.google.com/p/chromium/issues/detail?id=59849
--- a/libcef/common/request_impl.cc
+++ b/libcef/common/request_impl.cc
@@ -11,6 +11,7 @@
 #include "libcef/common/upload_data.h"

 #include "base/logging.h"
+#include "components/navigation_interception/navigation_params.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/common/resource_type.h"
 #include "net/base/elements_upload_data_stream.h"
@@ -101,12 +102,9 @@ CefRefPtr<CefRequest> CefRequest::Create() {
 // CefRequestImpl -------------------------------------------------------------

 CefRequestImpl::CefRequestImpl()
-    : method_("GET"),
-      resource_type_(RT_SUB_RESOURCE),
-      transition_type_(TT_EXPLICIT),
-      identifier_(0U),
-      flags_(UR_FLAG_NONE),
-      read_only_(false) {
+    : read_only_(false) {
+  base::AutoLock lock_scope(lock_);
+  Reset();
 }

 bool CefRequestImpl::IsReadOnly() {
@@ -209,6 +207,8 @@ void CefRequestImpl::Set(net::URLRequest* request) {
  base::AutoLock lock_scope(lock_);
  CHECK_READONLY_RETURN_VOID();

+  Reset();
+
  url_ = request->url().spec();
  method_ = request->method();
  first_party_for_cookies_ = request->first_party_for_cookies().spec();
@@ -238,8 +238,6 @@ void CefRequestImpl::Set(net::URLRequest* request) {
  if (data) {
    postdata_ = CefPostData::Create();
    static_cast<CefPostDataImpl*>(postdata_.get())->Set(*data);
-  } else if (postdata_.get()) {
-    postdata_ = NULL;
  }

  const content::ResourceRequestInfo* info =
@@ -249,9 +247,6 @@ void CefRequestImpl::Set(net::URLRequest* request) {
        static_cast<cef_resource_type_t>(info->GetResourceType());
    transition_type_ =
        static_cast<cef_transition_type_t>(info->GetPageTransition());
-  } else {
-    resource_type_ = RT_SUB_RESOURCE;
-    transition_type_ = TT_EXPLICIT;
  }
 }

@@ -286,12 +281,37 @@ void CefRequestImpl::Get(net::URLRequest* request) {
  }
 }

+void CefRequestImpl::Set(
+    const navigation_interception::NavigationParams& params,
+    bool is_main_frame) {
+  base::AutoLock lock_scope(lock_);
+  CHECK_READONLY_RETURN_VOID();
+
+  Reset();
+
+  url_ = params.url().spec();
+  method_ = params.is_post() ? "POST" : "GET";
+
+  const content::Referrer& sanitized_referrer =
+      content::Referrer::SanitizeForRequest(params.url(), params.referrer());
+  if (!sanitized_referrer.url.is_empty()) {
+    headermap_.insert(std::make_pair(
+        CefString("Referrer"), sanitized_referrer.url.spec()));
+  }
+
+  resource_type_ = is_main_frame ? RT_MAIN_FRAME : RT_SUB_FRAME;
+  transition_type_ =
+      static_cast<cef_transition_type_t>(params.transition_type());
+}
+
 void CefRequestImpl::Set(const blink::WebURLRequest& request) {
  DCHECK(!request.isNull());

  base::AutoLock lock_scope(lock_);
  CHECK_READONLY_RETURN_VOID();

+  Reset();
+
  url_ = request.url().spec().utf16();
  method_ = request.httpMethod();

@@ -299,22 +319,16 @@ void CefRequestImpl::Set(const blink::WebURLRequest& request) {
  if (!body.isNull()) {
    postdata_ = new CefPostDataImpl();
    static_cast<CefPostDataImpl*>(postdata_.get())->Set(body);
-  } else if (postdata_.get()) {
-    postdata_ = NULL;
  }

-  headermap_.clear();
  GetHeaderMap(request, headermap_);

-  flags_ = UR_FLAG_NONE;
  if (request.cachePolicy() == blink::WebURLRequest::ReloadIgnoringCacheData)
    flags_ |= UR_FLAG_SKIP_CACHE;
  if (request.allowStoredCredentials())
    flags_ |= UR_FLAG_ALLOW_CACHED_CREDENTIALS;
  if (request.reportUploadProgress())
    flags_ |= UR_FLAG_REPORT_UPLOAD_PROGRESS;
-  if (request.reportRawHeaders())
-    flags_ |= UR_FLAG_REPORT_RAW_HEADERS;

  first_party_for_cookies_ = request.firstPartyForCookies().spec().utf16();
 }
@@ -349,8 +363,6 @@ void CefRequestImpl::Get(blink::WebURLRequest& request) {
              UR_FLAG_ALLOW_CACHED_CREDENTIALS);
  SETBOOLFLAG(request, flags_, setReportUploadProgress,
              UR_FLAG_REPORT_UPLOAD_PROGRESS);
-  SETBOOLFLAG(request, flags_, setReportRawHeaders,
-              UR_FLAG_REPORT_RAW_HEADERS);

  if (!first_party_for_cookies_.empty()) {
    GURL gurl = GURL(first_party_for_cookies_.ToString());
@@ -412,6 +424,21 @@ void CefRequestImpl::SetHeaderMap(const HeaderMap& map,
                               base::string16(it->second));
 }

+void CefRequestImpl::Reset() {
+  lock_.AssertAcquired();
+  DCHECK(!read_only_);
+
+  url_.clear();
+  method_ = "GET";
+  postdata_ = NULL;
+  headermap_.clear();
+  resource_type_ = RT_SUB_RESOURCE;
+  transition_type_ = TT_EXPLICIT;
+  identifier_ = 0U;
+  flags_ = UR_FLAG_NONE;
+  first_party_for_cookies_.clear();
+}
+
 // CefPostData ----------------------------------------------------------------

 // static
--- a/libcef/common/request_impl.h
+++ b/libcef/common/request_impl.h
@@ -11,6 +11,10 @@
 #include "base/synchronization/lock.h"
 #include "third_party/WebKit/public/platform/WebHTTPBody.h"

+namespace navigation_interception {
+class NavigationParams;
+}
+
 namespace net {
 class HttpRequestHeaders;
 class UploadData;
@@ -56,6 +60,12 @@ class CefRequestImpl : public CefRequest {
  // Populate the URLRequest object from this object.
  void Get(net::URLRequest* request);

+  // Populate this object from the NavigationParams object.
+  // TODO(cef): Remove the |is_main_frame| argument once NavigationParams is
+  // reliable in reporting that value.
+  void Set(const navigation_interception::NavigationParams& params,
+           bool is_main_frame);
+
  // Populate this object from a WebURLRequest object.
  void Set(const blink::WebURLRequest& request);

@@ -71,7 +81,9 @@ class CefRequestImpl : public CefRequest {
  static void SetHeaderMap(const HeaderMap& map,
                           blink::WebURLRequest& request);

- protected:
+ private:
+  void Reset();
+
  CefString url_;
  CefString method_;
  CefRefPtr<CefPostData> postdata_;
@@ -113,7 +125,7 @@ class CefPostDataImpl : public CefPostData {

  void SetReadOnly(bool read_only);

- protected:
+ private:
  ElementVector elements_;

  // True if this object is read-only.
@@ -150,7 +162,7 @@ class CefPostDataElementImpl : public CefPostDataElement {

  void SetReadOnly(bool read_only);

- protected:
+ private:
  void Cleanup();

  Type type_;
--- a/libcef/renderer/content_renderer_client.cc
+++ b/libcef/renderer/content_renderer_client.cc
@@ -112,54 +112,6 @@ class CefPrerendererClient : public content::RenderViewObserver,
  void willAddPrerender(blink::WebPrerender* prerender) override {}
 };

-// Implementation of SequencedTaskRunner for WebWorker threads.
-class CefWebWorkerTaskRunner : public base::SequencedTaskRunner,
-                               public content::WorkerTaskRunner::Observer {
- public:
-  CefWebWorkerTaskRunner(content::WorkerTaskRunner* runner,
-                         int worker_id)
-      : runner_(runner),
-        worker_id_(worker_id) {
-    DCHECK(runner_);
-    DCHECK_GT(worker_id_, 0);
-    DCHECK(RunsTasksOnCurrentThread());
-
-    // Adds an observer for the current thread.
-    runner_->AddStopObserver(this);
-  }
-
-  // SequencedTaskRunner methods:
-  bool PostNonNestableDelayedTask(
-      const tracked_objects::Location& from_here,
-      const base::Closure& task,
-      base::TimeDelta delay) override {
-    return PostDelayedTask(from_here, task, delay);
-  }
-
-  // TaskRunner methods:
-  bool PostDelayedTask(const tracked_objects::Location& from_here,
-                       const base::Closure& task,
-                       base::TimeDelta delay) override {
-    if (delay != base::TimeDelta())
-      LOG(WARNING) << "Delayed tasks are not supported on WebWorker threads";
-    runner_->PostTask(worker_id_, task);
-    return true;
-  }
-
-  bool RunsTasksOnCurrentThread() const override {
-    return (runner_->CurrentWorkerId() == worker_id_);
-  }
-
-  // WorkerTaskRunner::Observer methods:
-  void OnWorkerRunLoopStopped() override {
-    CefContentRendererClient::Get()->RemoveWorkerTaskRunner(worker_id_);
-  }
-
- private:
-  content::WorkerTaskRunner* runner_;
-  int worker_id_;
-};
-
 void IsGuestViewApiAvailableToScriptContext(
    bool* api_is_available,
    extensions::ScriptContext* context) {
@@ -351,21 +303,6 @@ void CefContentRendererClient::DevToolsAgentDetached() {
    // When the last DevToolsAgent is detached the stack size is set to 0.
    // Restore the user-specified stack size here.
    CefV8SetUncaughtExceptionStackSize(uncaught_exception_stack_size_);
-
-    // And do the same for any WebWorker threads.
-    WorkerTaskRunnerMap map_copy;
-
-    {
-      base::AutoLock lock_scope(worker_task_runner_lock_);
-      map_copy = worker_task_runner_map_;
-    }
-
-    WorkerTaskRunnerMap::const_iterator it = map_copy.begin();
-    for (; it != map_copy.end(); ++it) {
-      it->second->PostTask(FROM_HERE,
-          base::Bind(CefV8SetUncaughtExceptionStackSize,
-                     uncaught_exception_stack_size_));
-    }
  }
 }

@@ -374,45 +311,9 @@ scoped_refptr<base::SequencedTaskRunner>
  // Check if currently on the render thread.
  if (CEF_CURRENTLY_ON_RT())
    return render_task_runner_;
-
-  // Check if a WebWorker exists for the current thread.
-  content::WorkerTaskRunner* worker_runner =
-      content::WorkerTaskRunner::Instance();
-  int worker_id = worker_runner->CurrentWorkerId();
-  if (worker_id > 0) {
-    base::AutoLock lock_scope(worker_task_runner_lock_);
-    WorkerTaskRunnerMap::const_iterator it =
-        worker_task_runner_map_.find(worker_id);
-    if (it != worker_task_runner_map_.end())
-      return it->second;
-
-    scoped_refptr<base::SequencedTaskRunner> task_runner =
-        new CefWebWorkerTaskRunner(worker_runner, worker_id);
-    worker_task_runner_map_[worker_id] = task_runner;
-    return task_runner;
-  }
-
  return NULL;
 }

-scoped_refptr<base::SequencedTaskRunner>
-    CefContentRendererClient::GetWorkerTaskRunner(int worker_id) {
-  base::AutoLock lock_scope(worker_task_runner_lock_);
-  WorkerTaskRunnerMap::const_iterator it =
-      worker_task_runner_map_.find(worker_id);
-  if (it != worker_task_runner_map_.end())
-    return it->second;
-
-  return NULL;
-}
-
-void CefContentRendererClient::RemoveWorkerTaskRunner(int worker_id) {
-  base::AutoLock lock_scope(worker_task_runner_lock_);
-  WorkerTaskRunnerMap::iterator it = worker_task_runner_map_.find(worker_id);
-  if (it != worker_task_runner_map_.end())
-    worker_task_runner_map_.erase(it);
-}
-
 void CefContentRendererClient::RunSingleProcessCleanup() {
  DCHECK(content::RenderProcessHost::run_renderer_in_process());

--- a/libcef/renderer/content_renderer_client.h
+++ b/libcef/renderer/content_renderer_client.h
@@ -71,18 +71,10 @@ class CefContentRendererClient : public content::ContentRendererClient,
  void DevToolsAgentAttached();
  void DevToolsAgentDetached();

-  // Returns the task runner for the current thread. If this is a WebWorker
-  // thread and the task runner does not already exist it will be created.
-  // Returns NULL if the current thread is not a valid render process thread.
+  // Returns the task runner for the current thread. Returns NULL if the current
+  // thread is not the main render process thread.
  scoped_refptr<base::SequencedTaskRunner> GetCurrentTaskRunner();

-  // Returns the task runner for the specified worker ID or NULL if the
-  // specified worker ID is not valid.
-  scoped_refptr<base::SequencedTaskRunner> GetWorkerTaskRunner(int worker_id);
-
-  // Remove the task runner associated with the specified worker ID.
-  void RemoveWorkerTaskRunner(int worker_id);
-
  // Perform cleanup work that needs to occur before shutdown when running in
  // single-process mode. Blocks until cleanup is complete.
  void RunSingleProcessCleanup();
@@ -154,13 +146,6 @@ class CefContentRendererClient : public content::ContentRendererClient,
  int devtools_agent_count_;
  int uncaught_exception_stack_size_;

-  // Map of worker thread IDs to task runners. Access must be protected by
-  // |worker_task_runner_lock_|.
-  typedef std::map<int, scoped_refptr<base::SequencedTaskRunner> >
-      WorkerTaskRunnerMap;
-  WorkerTaskRunnerMap worker_task_runner_map_;
-  base::Lock worker_task_runner_lock_;
-
  // Used in single-process mode to test when cleanup is complete.
  // Access must be protected by |single_process_cleanup_lock_|.
  bool single_process_cleanup_complete_;
--- a/libcef/renderer/dom_node_impl.cc
+++ b/libcef/renderer/dom_node_impl.cc
@@ -51,28 +51,7 @@ CefDOMNodeImpl::Type CefDOMNodeImpl::GetType() {
  if (!VerifyContext())
    return DOM_NODE_TYPE_UNSUPPORTED;

-  switch (node_.nodeType()) {
-    case WebNode::ElementNode:
-      return DOM_NODE_TYPE_ELEMENT;
-    case WebNode::AttributeNode:
-      return DOM_NODE_TYPE_ATTRIBUTE;
-    case WebNode::TextNode:
-      return DOM_NODE_TYPE_TEXT;
-    case WebNode::CDataSectionNode:
-      return DOM_NODE_TYPE_CDATA_SECTION;
-    case WebNode::ProcessingInstructionsNode:
-      return DOM_NODE_TYPE_PROCESSING_INSTRUCTIONS;
-    case WebNode::CommentNode:
-      return DOM_NODE_TYPE_COMMENT;
-    case WebNode::DocumentNode:
-      return DOM_NODE_TYPE_DOCUMENT;
-    case WebNode::DocumentTypeNode:
-      return DOM_NODE_TYPE_DOCUMENT_TYPE;
-    case WebNode::DocumentFragmentNode:
-      return DOM_NODE_TYPE_DOCUMENT_FRAGMENT;
-    default:
-      return DOM_NODE_TYPE_UNSUPPORTED;
-  }
+  return webkit_glue::GetNodeType(node_);
 }

 bool CefDOMNodeImpl::IsText() {
@@ -166,7 +145,7 @@ CefString CefDOMNodeImpl::GetName() {
  if (!VerifyContext())
    return str;

-  const WebString& name = node_.nodeName();
+  const WebString& name = webkit_glue::GetNodeName(node_);
  if (!name.isNull())
    str = name;

@@ -226,7 +205,7 @@ CefString CefDOMNodeImpl::GetAsMarkup() {
  if (!VerifyContext())
    return str;

-  const WebString& markup = node_.createMarkup();
+  const WebString& markup = webkit_glue::CreateNodeMarkup(node_);
  if (!markup.isNull())
    str = markup;

--- a/libcef/renderer/extensions/extensions_dispatcher_delegate.cc
+++ b/libcef/renderer/extensions/extensions_dispatcher_delegate.cc
@@ -4,12 +4,6 @@

 #include "libcef/renderer/extensions/extensions_dispatcher_delegate.h"

-#include "content/public/common/url_constants.h"
-#include "extensions/common/extension.h"
-#include "third_party/WebKit/public/platform/WebString.h"
-#include "third_party/WebKit/public/platform/WebURL.h"
-#include "third_party/WebKit/public/web/WebSecurityPolicy.h"
-
 namespace extensions {

 CefExtensionsDispatcherDelegate::CefExtensionsDispatcherDelegate() {
@@ -18,19 +12,4 @@ CefExtensionsDispatcherDelegate::CefExtensionsDispatcherDelegate() {
 CefExtensionsDispatcherDelegate::~CefExtensionsDispatcherDelegate() {
 }

-void CefExtensionsDispatcherDelegate::InitOriginPermissions(
-    const Extension* extension,
-    bool is_extension_active) {
-  if (is_extension_active) {
-    // The chrome: scheme is marked as display isolated in
-    // RenderThreadImpl::RegisterSchemes() so an exception must be added for
-    // accessing chrome://resources from the extension origin.
-    blink::WebSecurityPolicy::addOriginAccessWhitelistEntry(
-        extension->url(),
-        blink::WebString::fromUTF8(content::kChromeUIScheme),
-        blink::WebString::fromUTF8("resources"),
-        false);
-  }
-}
-
 }  // namespace extensions
--- a/libcef/renderer/extensions/extensions_dispatcher_delegate.h
+++ b/libcef/renderer/extensions/extensions_dispatcher_delegate.h
@@ -16,10 +16,6 @@ class CefExtensionsDispatcherDelegate : public DispatcherDelegate {
  ~CefExtensionsDispatcherDelegate() override;

 private:
-  // DispatcherDelegate implementation.
-  void InitOriginPermissions(const Extension* extension,
-                             bool is_extension_active) override;
-
  DISALLOW_COPY_AND_ASSIGN(CefExtensionsDispatcherDelegate);
 };

--- a/libcef/renderer/plugins/cef_plugin_placeholder.cc
+++ b/libcef/renderer/plugins/cef_plugin_placeholder.cc
@@ -99,6 +99,7 @@ CefPluginPlaceholder* CefPluginPlaceholder::CreateBlockedPlugin(
  values.SetString("name", name);
  values.SetString("hide", l10n_util::GetStringUTF8(IDS_PLUGIN_HIDE));
  values.SetString("pluginType",
+                   frame->view()->mainFrame()->isWebLocalFrame() &&
                   frame->view()->mainFrame()->document().isPluginDocument()
                       ? "document"
                       : "embedded");
@@ -240,8 +241,10 @@ void CefPluginPlaceholder::ShowContextMenu(

  content::MenuItem hide_item;
  hide_item.action = chrome::MENU_COMMAND_PLUGIN_HIDE;
-  hide_item.enabled =
-      !GetFrame()->view()->mainFrame()->document().isPluginDocument();
+  bool is_main_frame_plugin_document =
+      GetFrame()->view()->mainFrame()->isWebLocalFrame() &&
+      GetFrame()->view()->mainFrame()->document().isPluginDocument();
+  hide_item.enabled = !is_main_frame_plugin_document;
  hide_item.label = l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_PLUGIN_HIDE);
  params.custom_items.push_back(hide_item);

--- a/libcef/renderer/webkit_glue.cc
+++ b/libcef/renderer/webkit_glue.cc
@@ -27,6 +27,7 @@ MSVC_PUSH_WARNING_LEVEL(0);

 #include "third_party/WebKit/Source/core/css/parser/CSSParser.h"
 #include "third_party/WebKit/Source/core/dom/Node.h"
+#include "third_party/WebKit/Source/core/editing/serializers/Serialization.h"
 #include "third_party/WebKit/Source/web/WebLocalFrameImpl.h"
 #include "third_party/WebKit/Source/web/WebViewImpl.h"
 MSVC_POP_WARNING();
@@ -79,6 +80,41 @@ std::string DumpDocumentText(blink::WebFrame* frame) {
  return document_element.textContent().utf8();
 }

+cef_dom_node_type_t GetNodeType(const blink::WebNode& node) {
+  const blink::Node* web_node = node.constUnwrap<blink::Node>();
+  switch (web_node->nodeType()) {
+    case blink::Node::ELEMENT_NODE:
+      return DOM_NODE_TYPE_ELEMENT;
+    case blink::Node::ATTRIBUTE_NODE:
+      return DOM_NODE_TYPE_ATTRIBUTE;
+    case blink::Node::TEXT_NODE:
+      return DOM_NODE_TYPE_TEXT;
+    case blink::Node::CDATA_SECTION_NODE:
+      return DOM_NODE_TYPE_CDATA_SECTION;
+    case blink::Node::PROCESSING_INSTRUCTION_NODE:
+      return DOM_NODE_TYPE_PROCESSING_INSTRUCTIONS;
+    case blink::Node::COMMENT_NODE:
+      return DOM_NODE_TYPE_COMMENT;
+    case blink::Node::DOCUMENT_NODE:
+      return DOM_NODE_TYPE_DOCUMENT;
+    case blink::Node::DOCUMENT_TYPE_NODE:
+      return DOM_NODE_TYPE_DOCUMENT_TYPE;
+    case blink::Node::DOCUMENT_FRAGMENT_NODE:
+      return DOM_NODE_TYPE_DOCUMENT_FRAGMENT;
+  }
+  return DOM_NODE_TYPE_UNSUPPORTED;
+}
+
+blink::WebString GetNodeName(const blink::WebNode& node) {
+  const blink::Node* web_node = node.constUnwrap<blink::Node>();
+  return web_node->nodeName();
+}
+
+blink::WebString CreateNodeMarkup(const blink::WebNode& node) {
+  const blink::Node* web_node = node.constUnwrap<blink::Node>();
+  return blink::createMarkup(web_node);
+}
+
 bool SetNodeValue(blink::WebNode& node, const blink::WebString& value) {
  blink::Node* web_node = node.unwrap<blink::Node>();
  web_node->setNodeValue(value);
--- a/libcef/renderer/webkit_glue.h
+++ b/libcef/renderer/webkit_glue.h
@@ -10,6 +10,8 @@
 #include "base/basictypes.h"
 #include "third_party/skia/include/core/SkColor.h"

+#include "include/internal/cef_types.h"
+
 namespace blink {
 class WebFrame;
 class WebNode;
@@ -29,6 +31,10 @@ void GoForward(blink::WebView* view);
 // Returns the text of the document element.
 std::string DumpDocumentText(blink::WebFrame* frame);

+// Expose additional actions on WebNode.
+cef_dom_node_type_t GetNodeType(const blink::WebNode& node);
+blink::WebString GetNodeName(const blink::WebNode& node);
+blink::WebString CreateNodeMarkup(const blink::WebNode& node);
 bool SetNodeValue(blink::WebNode& node, const blink::WebString& value);

 int64 GetIdentifier(blink::WebFrame* frame);
--- a/libcef/resources/cef_resources.grd
+++ b/libcef/resources/cef_resources.grd
@@ -10,8 +10,6 @@
  <release seq="1">
    <includes>
      <include name="IDR_CEF_DEVTOOLS_DISCOVERY_PAGE" file="devtools_discovery_page.html" type="BINDATA" />
-      <include name="IDR_CEF_CREDITS_HTML" file="${about_credits_file}" use_base_dir="false" type="BINDATA" />
-      <include name="IDR_CEF_CREDITS_JS" file="..\..\..\chrome\browser\resources\about_credits.js" type="BINDATA" />
      <include name="IDR_CEF_LICENSE_TXT" file="..\..\LICENSE.txt" type="BINDATA" />
      <include name="IDR_CEF_VERSION_HTML" file="about_version.html" type="BINDATA" />