Update to Chromium revision 261035.

- The CefSettings.release_dcheck_enabled option has been removed. This functionality can be enabled by setting the dcheck_always_on=1 gyp variable before building CEF/Chromium. See http://crbug.com/350462 for details.
- The UR_FLAG_ALLOW_COOKIES option has been removed and the functionality has been merged into UR_FLAG_ALLOW_CACHED_CREDENTIALS.
- Mac: [NSApplication sharedApplication] should no longer be called in the renderer process. See http://crbug.com/306348 for details.

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

libcef/common/cef_switches.cc

@@ -18,9 +18,6 @@ const char kLogSeverity_Error[]           = "error";
 const char kLogSeverity_ErrorReport[]     = "error-report";
 const char kLogSeverity_Disable[]         = "disable";
 
-// Enable DCHECK for release mode.
-const char kEnableReleaseDcheck[]         = "enable-release-dcheck";
-
 // Path to resources directory.
 const char kResourcesDirPath[]            = "resources-dir-path";
 

libcef/common/cef_switches.h

@@ -18,7 +18,6 @@ extern const char kLogSeverity_Warning[];
 extern const char kLogSeverity_Error[];
 extern const char kLogSeverity_ErrorReport[];
 extern const char kLogSeverity_Disable[];
-extern const char kEnableReleaseDcheck[];
 extern const char kResourcesDirPath[];
 extern const char kLocalesDirPath[];
 extern const char kDisablePackLoading[];

libcef/common/content_client.cc

@@ -15,8 +15,8 @@
 #include "base/strings/stringprintf.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/user_agent.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "webkit/common/user_agent/user_agent_util.h"
 
 namespace {
 
@@ -69,7 +69,7 @@ void CefContentClient::AddAdditionalSchemes(
 std::string CefContentClient::GetUserAgent() const {
   std::string product_version;
 
-  static CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kProductVersion)) {
     product_version =
         command_line.GetSwitchValueASCII(switches::kProductVersion);
@@ -79,7 +79,7 @@ std::string CefContentClient::GetUserAgent() const {
         CHROME_VERSION_PATCH);
   }
 
-  return webkit_glue::BuildUserAgentFromProduct(product_version);
+  return content::BuildUserAgentFromProduct(product_version);
 }
 
 base::string16 CefContentClient::GetLocalizedString(int message_id) const {

libcef/common/drag_data_impl.cc

@@ -54,10 +54,10 @@ bool CefDragDataImpl::GetFileNames(std::vector<CefString>& names) {
   if (data_.filenames.empty())
     return false;
 
-  std::vector<content::DropData::FileInfo>::const_iterator it =
+  std::vector<ui::FileInfo>::const_iterator it =
       data_.filenames.begin();
   for (; it != data_.filenames.end(); ++it)
-    names.push_back(it->path);
+    names.push_back(it->path.value());
 
   return true;
 }

libcef/common/main_delegate.cc

@@ -248,9 +248,6 @@ bool CefMainDelegate::BasicStartupComplete(int* exit_code) {
         command_line->AppendSwitchASCII(switches::kLogSeverity, log_severity);
     }
 
-    if (settings.release_dcheck_enabled)
-      command_line->AppendSwitch(switches::kEnableReleaseDcheck);
-
     if (settings.javascript_flags.length > 0) {
       command_line->AppendSwitchASCII(switches::kJavaScriptFlags,
           CefString(&settings.javascript_flags));
@@ -347,14 +344,6 @@ bool CefMainDelegate::BasicStartupComplete(int* exit_code) {
     logging::SetMinLogLevel(log_severity);
   }
 
-  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_settings);
 
   content::SetContentClient(&content_client_);

libcef/common/request_impl.cc

@@ -307,8 +307,6 @@ void CefRequestImpl::Set(const blink::WebURLRequest& request) {
     flags_ |= UR_FLAG_SKIP_CACHE;
   if (request.allowStoredCredentials())
     flags_ |= UR_FLAG_ALLOW_CACHED_CREDENTIALS;
-  if (request.allowCookies())
-    flags_ |= UR_FLAG_ALLOW_COOKIES;
   if (request.reportUploadProgress())
     flags_ |= UR_FLAG_REPORT_UPLOAD_PROGRESS;
   if (request.reportLoadTiming())
@@ -351,8 +349,6 @@ void CefRequestImpl::Get(blink::WebURLRequest& request) {
 
   SETBOOLFLAG(request, flags_, setAllowStoredCredentials,
               UR_FLAG_ALLOW_CACHED_CREDENTIALS);
-  SETBOOLFLAG(request, flags_, setAllowCookies,
-              UR_FLAG_ALLOW_COOKIES);
   SETBOOLFLAG(request, flags_, setReportUploadProgress,
               UR_FLAG_REPORT_UPLOAD_PROGRESS);
   SETBOOLFLAG(request, flags_, setReportLoadTiming,

libcef/common/scheme_registration.cc

@@ -25,7 +25,7 @@ void AddInternalSchemes(std::vector<std::string>* standard_schemes) {
 
 bool IsInternalHandledScheme(const std::string& scheme) {
   static const char* schemes[] = {
-    chrome::kBlobScheme,
+    content::kBlobScheme,
     content::kChromeDevToolsScheme,
     content::kChromeUIScheme,
     content::kDataScheme,
@@ -46,7 +46,7 @@ bool IsInternalProtectedScheme(const std::string& scheme) {
   // content/browser/storage_partition_impl_map.cc and are modified by
   // InstallInternalProtectedHandlers().
   static const char* schemes[] = {
-    chrome::kBlobScheme,
+    content::kBlobScheme,
     content::kChromeUIScheme,
     content::kDataScheme,
     content::kFileScheme,