From bdd8ea32582e53483a0d818ee100e7c7d0e36d35 Mon Sep 17 00:00:00 2001 From: "zeno.albisser@digia.com" Date: Wed, 28 Aug 2013 21:25:52 +0000 Subject: Template arguments to templates in std must have complete types. Removing several forward declarations to ensure complete types when instantiating a template in std. clang++ on mac complains about this issue if building with libc++. BUG=267500 R=thakis@chromium.org Review URL: https://chromiumcodereview.appspot.com/22633003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220094 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/support/weburl_loader_mock_factory.cc | 5 ----- webkit/support/weburl_loader_mock_factory.h | 8 ++++++-- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'webkit') diff --git a/webkit/support/weburl_loader_mock_factory.cc b/webkit/support/weburl_loader_mock_factory.cc index f18bc07..f459211 100644 --- a/webkit/support/weburl_loader_mock_factory.cc +++ b/webkit/support/weburl_loader_mock_factory.cc @@ -24,11 +24,6 @@ using WebKit::WebURLLoader; using WebKit::WebURLRequest; using WebKit::WebURLResponse; -struct WebURLLoaderMockFactory::ResponseInfo { - WebKit::WebURLResponse response; - base::FilePath file_path; -}; - WebURLLoaderMockFactory::WebURLLoaderMockFactory() {} WebURLLoaderMockFactory::~WebURLLoaderMockFactory() {} diff --git a/webkit/support/weburl_loader_mock_factory.h b/webkit/support/weburl_loader_mock_factory.h index 78abd96..8f00fc0 100644 --- a/webkit/support/weburl_loader_mock_factory.h +++ b/webkit/support/weburl_loader_mock_factory.h @@ -9,12 +9,12 @@ #include "base/files/file_path.h" #include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/platform/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" namespace WebKit { class WebData; -struct WebURLError; class WebURLLoader; } @@ -75,7 +75,11 @@ class WebURLLoaderMockFactory { void CancelLoad(WebURLLoaderMock* loader); private: - struct ResponseInfo; + struct ResponseInfo { + WebKit::WebURLResponse response; + base::FilePath file_path; + }; + // Loads the specified request and populates the response, error and data // accordingly. -- cgit v1.1