Drop a couple of unused files that broke certain jumbo builds.
A completely unused object file in a static library will be ignored by the linker, but with jumbo builds unused cc files will be grouped with used cc files and the object file will no longer be ignored. If the cc file contains code that is bad it can then trigger followup linker errors which happened in this case where debug component windows builds had too many constructors and destructors for WebAssociatedURLLoader when building webkit_unit_tests.exe Change-Id: I16a0332b9e16903481c2995f2176e59a1ba8e53e Reviewed-on: https://chromium-review.googlesource.com/955850 Reviewed-by: Jochen Eisinger <jochen@chromium.org> Commit-Queue: Daniel Bratell <bratell@opera.com> Cr-Commit-Position: refs/heads/master@{#542843}
This commit is contained in:

committed by
Commit Bot

parent
ed30ac6ab1
commit
a0dd39caf7
@@ -219,8 +219,6 @@ jumbo_static_library("test_support") {
|
||||
"mock_render_widget_host_delegate.h",
|
||||
"mock_ssl_host_state_delegate.cc",
|
||||
"mock_ssl_host_state_delegate.h",
|
||||
"mock_webassociatedurlloader.cc",
|
||||
"mock_webassociatedurlloader.h",
|
||||
"mock_webblob_registry_impl.cc",
|
||||
"mock_webblob_registry_impl.h",
|
||||
"mock_webclipboard_impl.cc",
|
||||
|
@@ -1,18 +0,0 @@
|
||||
// Copyright 2013 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/test/mock_webassociatedurlloader.h"
|
||||
|
||||
#include "third_party/WebKit/public/platform/WebData.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 content {
|
||||
|
||||
MockWebAssociatedURLLoader::MockWebAssociatedURLLoader() {}
|
||||
|
||||
MockWebAssociatedURLLoader::~MockWebAssociatedURLLoader() {}
|
||||
|
||||
} // namespace content
|
@@ -1,34 +0,0 @@
|
||||
// Copyright 2013 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.
|
||||
|
||||
#ifndef CONTENT_TEST_MOCK_WEBASSOCIATEDURLLOADER_H_
|
||||
#define CONTENT_TEST_MOCK_WEBASSOCIATEDURLLOADER_H_
|
||||
|
||||
#include "base/macros.h"
|
||||
#include "base/single_thread_task_runner.h"
|
||||
#include "testing/gmock/include/gmock/gmock.h"
|
||||
#include "third_party/WebKit/public/web/WebAssociatedURLLoader.h"
|
||||
|
||||
namespace content {
|
||||
|
||||
class MockWebAssociatedURLLoader : public blink::WebAssociatedURLLoader {
|
||||
public:
|
||||
MockWebAssociatedURLLoader();
|
||||
virtual ~MockWebAssociatedURLLoader();
|
||||
|
||||
MOCK_METHOD2(LoadAsynchronously,
|
||||
void(const blink::WebURLRequest& request,
|
||||
blink::WebAssociatedURLLoaderClient* client));
|
||||
MOCK_METHOD0(Cancel, void());
|
||||
MOCK_METHOD1(SetDefersLoading, void(bool value));
|
||||
MOCK_METHOD1(SetLoadingTaskRunner,
|
||||
void(base::SingleThreadTaskRunner* loading_task_runner));
|
||||
|
||||
private:
|
||||
DISALLOW_COPY_AND_ASSIGN(MockWebAssociatedURLLoader);
|
||||
};
|
||||
|
||||
} // namespace content
|
||||
|
||||
#endif // CONTENT_TEST_MOCK_WEBASSOCIATEDURLLOADER_H_
|
Reference in New Issue
Block a user