Commit 8eec813f authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Avoid collision between two ScriptExecutionCallbackHelper

ScriptExecutionCallbackHelper is the name of two different
helper functions which in some non-standard jumbo configurations
(huuuge jumbo chunks) end up in the same translation unit. This
patch changes the scope of one of the classes to not clash.

Bug: 745732
Change-Id: Ifed9bcd247c43afb110c9b008062383a2a7d74df
Reviewed-on: https://chromium-review.googlesource.com/848835Reviewed-by: default avatarFredrik Söderquist <fs@opera.com>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#526690}
parent 0509771f
......@@ -15,8 +15,8 @@
#include "public/web/WebView.h"
namespace blink {
namespace virtual_time_test {
namespace {
class ScriptExecutionCallbackHelper : public WebScriptExecutionCallback {
public:
const String Result() const { return result_; }
......@@ -30,7 +30,6 @@ class ScriptExecutionCallbackHelper : public WebScriptExecutionCallback {
String result_;
};
} // namespace
class VirtualTimeTest : public SimTest {
protected:
......@@ -252,4 +251,5 @@ TEST_F(VirtualTimeTest, MAYBE_DOMTimersSuspended) {
#undef MAYBE_AllowVirtualTimeToAdvance
#undef MAYBE_VirtualTimeNotAllowedToAdvanceWhileResourcesLoading
#undef MAYBE_DOMTimersSuspended
} // namespace virtual_time_test
} // namespace blink
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment