Extend the TestRunner so that the manifest-src CSP directive can be tested from layout tests.

content/test/layouttest_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 "content/public/test/layouttest_support.h"
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "cc/blink/web_layer_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/gpu/image_transport_surface.h"
 #include "content/public/common/page_state.h"
 #include "content/public/renderer/renderer_gamepad_provider.h"
+#include "content/renderer/fetchers/manifest_fetcher.h"
 #include "content/renderer/history_entry.h"
 #include "content/renderer/history_serialization.h"
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
 #include "content/shell/renderer/test_runner/test_common.h"
 #include "content/shell/renderer/test_runner/web_frame_test_proxy.h"
 #include "content/shell/renderer/test_runner/web_test_proxy.h"
 #include "third_party/WebKit/public/platform/WebBatteryStatus.h"
 #include "third_party/WebKit/public/platform/WebDeviceMotionData.h"
 #include "third_party/WebKit/public/platform/WebDeviceOrientationData.h"
 #include "third_party/WebKit/public/platform/WebGamepads.h"
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
+#include "third_party/WebKit/public/web/WebView.h"
 
 #if defined(OS_MACOSX)
 #include "content/browser/frame_host/popup_menu_helper_mac.h"
 #endif
 
 using blink::WebBatteryStatus;
 using blink::WebDeviceMotionData;
 using blink::WebDeviceOrientationData;
 using blink::WebGamepad;
 using blink::WebGamepads;
@@ skipping 37 matching lines @@
 }  // namespace
 
 
 void EnableWebTestProxyCreation(
     const base::Callback<void(RenderView*, WebTestProxyBase*)>& callback) {
   g_callback.Get() = callback;
   RenderViewImpl::InstallCreateHook(CreateWebTestProxy);
   RenderFrameImpl::InstallCreateHook(CreateWebFrameTestProxy);
 }
 
+void FetchManifestDoneCallback(ManifestFetcher* fetcher,

[mlamouri (slow - plz ping), 2014/09/18 17:36:05]

nit: I think you should align parameters.

+    ManifestFetcher::Callback callback,

[mlamouri (slow - plz ping), 2014/09/18 17:36:05]

const ManifestFetcher::Callback& callback

+    const blink::WebURLResponse& response,
+    const std::string& data) {
+  delete fetcher;
+  callback.Run(response, data);
+}
+
+void FetchManifest(blink::WebView* view, GURL url,
+    ManifestFetcher::Callback callback) {

[mlamouri (slow - plz ping), 2014/09/18 17:36:05]

It's a bit odd to have a non typed callback in the header and a typed callback
here. I would add a type specific to this file.

+  ManifestFetcher* fetcher = new ManifestFetcher(url);
+
+  fetcher->Start(view->mainFrame(),
+    base::Bind(&FetchManifestDoneCallback,
+               base::Unretained(fetcher),

[mlamouri (slow - plz ping), 2014/09/18 17:36:05]

Alternatively, you could make |fetcher| be a scoped_ptr and Pass it to the
callback so it would be clearer that you make the callback owner of the object.
You wouldn't even have to explicitely |delete| it anymore.

+               callback));
+}
+
 void SetMockGamepadProvider(scoped_ptr<RendererGamepadProvider> provider) {
   RenderThreadImpl::current()->webkit_platform_support()->
       SetPlatformEventObserverForTesting(
           blink::WebPlatformEventGamepad,
           provider.PassAs<PlatformEventObserverBase>());
 }
 
 void SetMockDeviceLightData(const double data) {
   RendererWebKitPlatformSupportImpl::SetMockDeviceLightDataForTesting(data);
 }
@@ skipping 265 matching lines @@
   }
   result.append("===============================================\n");
   return result;
 }
 
 blink::WebLayer* InstantiateWebLayer(scoped_refptr<cc::TextureLayer> layer) {
   return new cc_blink::WebLayerImpl(layer);
 }
 
 }  // namespace content