Merge 147060 to 1180 (M21) - PPAPI (Flash): Properly honor Pepper url requests with custom user age…

webkit/support/webkit_support.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/support/webkit_support.h"
 
 #include "base/at_exit.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 689 matching lines @@
 WebKit::WebURLError CreateCancelledError(const WebKit::WebURLRequest& request) {
   WebKit::WebURLError error;
   error.domain = WebKit::WebString::fromUTF8(net::kErrorDomain);
   error.reason = net::ERR_ABORTED;
   error.unreachableURL = request.url();
   return error;
 }
 
 WebKit::WebURLRequest::ExtraData* CreateWebURLRequestExtraData(
     WebKit::WebReferrerPolicy referrer_policy) {
-  return new webkit_glue::WebURLRequestExtraDataImpl(referrer_policy);
+  return new webkit_glue::WebURLRequestExtraDataImpl(referrer_policy,
+                                                     WebKit::WebString());
 }
 
 // Bridge for SimpleDatabaseSystem
 
 void SetDatabaseQuota(int quota) {
   SimpleDatabaseSystem::GetInstance()->SetDatabaseQuota(quota);
 }
 
 void ClearAllDatabases() {
   SimpleDatabaseSystem::GetInstance()->ClearAllDatabases();
@@ skipping 67 matching lines @@
 // Logging
 void EnableWebCoreLogChannels(const std::string& channels) {
   webkit_glue::EnableWebCoreLogChannels(channels);
 }
 
 void SetGamepadData(const WebKit::WebGamepads& pads) {
   test_environment->webkit_platform_support()->setGamepadData(pads);
 }
 
 }  // namespace webkit_support