Update to Chromium revision 208345.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1313 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

CHROMIUM_BUILD_COMPATIBILITY.txt

@@ -17,5 +17,5 @@
 
 {
   'chromium_url': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_revision': '207871',
+  'chromium_revision': '208345',
 }

cef.gyp

@@ -789,7 +789,8 @@
       ],
       'include_dirs': [
         '.',
-        '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/public',
+        '<(DEPTH)/third_party/WebKit/public/platform',
+        '<(DEPTH)/third_party/WebKit/public/web',
         # CEF grit resource includes
         '<(grit_out_dir)',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings',
@@ -809,7 +810,6 @@
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_prefs',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(DEPTH)/ipc/ipc.gyp:ipc',
         '<(DEPTH)/media/media.gyp:media',
         '<(DEPTH)/net/net.gyp:net',

libcef/browser/browser_host_impl.cc

@@ -424,25 +424,12 @@ CefRefPtr<CefBrowserHostImpl> CefBrowserHostImpl::GetBrowserByChildID(
       int render_process_id) {
   if (CEF_CURRENTLY_ON_UIT()) {
     // Use the non-thread-safe but potentially faster approach.
-    content::RenderProcessHost* render_process_host =
-        content::RenderProcessHost::FromID(render_process_id);
-    if (!render_process_host)
-      return NULL;
-
-    content::RenderProcessHost::RenderWidgetHostsIterator iter(
-        render_process_host->GetRenderWidgetHostsIterator());
-    if (!iter.IsAtEnd()) {
-      const content::RenderWidgetHost* widget = iter.GetCurrentValue();
-
-      // This implementation is based on an assumption that each process hosts a
-      // single renderer. Revisit this implementation if the assumption proves
-      // false.
-      iter.Advance();
-      DCHECK(iter.IsAtEnd());
-
-      if (widget && widget->IsRenderView()) {
-        return GetBrowserForHost(content::RenderViewHost::From(
-            const_cast<content::RenderWidgetHost*>(widget)));
+    content::RenderWidgetHost::List widgets =
+        content::RenderWidgetHost::GetRenderWidgetHosts();
+    for (size_t i = 0; i < widgets.size(); ++i) {
+      if (widgets[i]->GetProcess()->GetID() == render_process_id &&
+          widgets[i]->IsRenderView()) {
+        return GetBrowserForHost(content::RenderViewHost::From(widgets[i]));
       }
     }
 

libcef/browser/devtools_delegate.cc

@@ -60,17 +60,13 @@ content::DevToolsAgentHost* CefDevToolsBindingHandler::ForIdentifier(
     if (!render_process_host->HasConnection())
       continue;
 
-    content::RenderProcessHost::RenderWidgetHostsIterator rwit(
-        render_process_host->GetRenderWidgetHostsIterator());
-    for (; !rwit.IsAtEnd(); rwit.Advance()) {
-      const content::RenderWidgetHost* widget = rwit.GetCurrentValue();
-      DCHECK(widget);
-      if (!widget || !widget->IsRenderView())
+    content::RenderWidgetHost::List widgets =
+        content::RenderWidgetHost::GetRenderWidgetHosts();
+    for (size_t i = 0; i < widgets.size(); ++i) {
+      if (!widgets[i]->IsRenderView())
         continue;
 
-      content::RenderViewHost* host =
-          content::RenderViewHost::From(
-              const_cast<content::RenderWidgetHost*>(widget));
+      content::RenderViewHost* host = content::RenderViewHost::From(widgets[i]);
       if (GetIdentifier(host) == identifier) {
         // May create a new agent host.
         scoped_refptr<content::DevToolsAgentHost> agent_host(

libcef/browser/javascript_dialog_mac.mm

@@ -8,7 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 
@@ -16,7 +16,7 @@
 // going away. Is responsible for cleaning itself up.
 @interface CefJavaScriptDialogHelper : NSObject<NSAlertDelegate> {
  @private
-  scoped_nsobject<NSAlert> alert_;
+  base::scoped_nsobject<NSAlert> alert_;
   NSTextField* textField_;  // WEAK; owned by alert_
 
   // Copies of the fields in CefJavaScriptDialog because they're private.

libcef/browser/text_input_client_osr_mac.h

@@ -11,7 +11,7 @@
 
 #include "libcef/browser/render_widget_host_view_osr.h"
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/strings/string16.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/edit_command.h"
@@ -36,7 +36,7 @@
 
  @private
   // Represents the input-method attributes supported by this object.
-  scoped_nsobject<NSArray> validAttributesForMarkedText_;
+  base::scoped_nsobject<NSArray> validAttributesForMarkedText_;
 
   // Indicates if we are currently handling a key down event.
   BOOL handlingKeyDown_;

libcef/common/main_delegate.cc

@@ -283,12 +283,16 @@ bool CefMainDelegate::BasicStartupComplete(int* exit_code) {
   }
 
   // Initialize logging.
-  base::FilePath log_file =
-      command_line->GetSwitchValuePath(switches::kLogFile);
-  std::string log_severity_str =
-      command_line->GetSwitchValueASCII(switches::kLogSeverity);
+  logging::LoggingSettings log_settings;
+  log_settings.log_file =
+      command_line->GetSwitchValuePath(switches::kLogFile).value().c_str();
+  log_settings.lock_log = logging::DONT_LOCK_LOG_FILE;
+  log_settings.delete_old = logging::APPEND_TO_OLD_LOG_FILE;
 
   logging::LogSeverity log_severity = logging::LOG_INFO;
+
+  std::string log_severity_str =
+      command_line->GetSwitchValueASCII(switches::kLogSeverity);
   if (!log_severity_str.empty()) {
     if (LowerCaseEqualsASCII(log_severity_str,
                              switches::kLogSeverity_Verbose)) {
@@ -308,22 +312,22 @@ bool CefMainDelegate::BasicStartupComplete(int* exit_code) {
     }
   }
 
-  logging::LoggingDestination logging_dest;
   if (log_severity == LOGSEVERITY_DISABLE) {
-    logging_dest = logging::LOG_NONE;
+    log_settings.logging_dest = logging::LOG_NONE;
   } else {
-    logging_dest = logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG;
+    log_settings.logging_dest = logging::LOG_TO_ALL;
     logging::SetMinLogLevel(log_severity);
   }
 
-  logging::DcheckState dcheck_state =
-      logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
-  if (command_line->HasSwitch(switches::kEnableReleaseDcheck))
-    dcheck_state = logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
+  if (command_line->HasSwitch(switches::kEnableReleaseDcheck)) {
+    log_settings.dcheck_state =
+        logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
+  } else {
+    log_settings.dcheck_state =
+        logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
+  }
 
-  logging::InitLogging(log_file.value().c_str(), logging_dest,
-      logging::DONT_LOCK_LOG_FILE, logging::APPEND_TO_OLD_LOG_FILE,
-      dcheck_state);
+  logging::InitLogging(log_settings);
 
   content::SetContentClient(&content_client_);
 

patch/patches/webkit_popups.patch

@@ -1,6 +1,6 @@
 Index: public/web/WebView.h
 ===================================================================
---- public/web/WebView.h	(revision 152832)
+--- public/web/WebView.h	(revision 152953)
 +++ public/web/WebView.h	(working copy)
 @@ -421,6 +421,7 @@
  
@@ -12,9 +12,9 @@ Index: public/web/WebView.h
      // Visited link state --------------------------------------------------
 Index: Source/WebKit/chromium/src/ChromeClientImpl.cpp
 ===================================================================
---- Source/WebKit/chromium/src/ChromeClientImpl.cpp	(revision 152832)
+--- Source/WebKit/chromium/src/ChromeClientImpl.cpp	(revision 152953)
 +++ Source/WebKit/chromium/src/ChromeClientImpl.cpp	(working copy)
-@@ -893,7 +893,7 @@
+@@ -895,7 +895,7 @@
  
  PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(Frame& frame, PopupMenuClient* client) const
  {
@@ -25,9 +25,9 @@ Index: Source/WebKit/chromium/src/ChromeClientImpl.cpp
      return adoptRef(new PopupMenuChromium(frame, client));
 Index: Source/WebKit/chromium/src/WebViewImpl.cpp
 ===================================================================
---- Source/WebKit/chromium/src/WebViewImpl.cpp	(revision 152832)
+--- Source/WebKit/chromium/src/WebViewImpl.cpp	(revision 152953)
 +++ Source/WebKit/chromium/src/WebViewImpl.cpp	(working copy)
-@@ -392,6 +392,7 @@
+@@ -393,6 +393,7 @@
      , m_fakeDoubleTapPageScaleFactor(0)
      , m_fakeDoubleTapUseAnchor(false)
      , m_contextMenuAllowed(false)
@@ -35,7 +35,7 @@ Index: Source/WebKit/chromium/src/WebViewImpl.cpp
      , m_doingDragAndDrop(false)
      , m_ignoreInputEvents(false)
      , m_suppressNextKeypressEvent(false)
-@@ -3660,9 +3661,14 @@
+@@ -3676,9 +3677,14 @@
      updateLayerTreeViewport();
  }
  
@@ -53,7 +53,7 @@ Index: Source/WebKit/chromium/src/WebViewImpl.cpp
  void WebViewImpl::setEmulatedTextZoomFactor(float textZoomFactor)
 Index: Source/WebKit/chromium/src/WebViewImpl.h
 ===================================================================
---- Source/WebKit/chromium/src/WebViewImpl.h	(revision 152832)
+--- Source/WebKit/chromium/src/WebViewImpl.h	(revision 152953)
 +++ Source/WebKit/chromium/src/WebViewImpl.h	(working copy)
 @@ -415,7 +415,8 @@
  
@@ -65,7 +65,7 @@ Index: Source/WebKit/chromium/src/WebViewImpl.h
  
      bool contextMenuAllowed() const
      {
-@@ -731,6 +732,8 @@
+@@ -733,6 +734,8 @@
  
      bool m_contextMenuAllowed;