Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2917)

Unified Diff: Source/web/tests/LinkHighlightTest.cpp

Issue 1174283002: Fix unit test style in Source/web/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove static Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/tests/LayoutGeometryMapTest.cpp ('k') | Source/web/tests/ListenerLeakTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/LinkHighlightTest.cpp
diff --git a/Source/web/tests/LinkHighlightTest.cpp b/Source/web/tests/LinkHighlightTest.cpp
index 7821808984fca88a279cf53739ce696ac69f7b1b..0f25a1c9263d8ed8495db03be75140cbbb54bdaa 100644
--- a/Source/web/tests/LinkHighlightTest.cpp
+++ b/Source/web/tests/LinkHighlightTest.cpp
@@ -23,7 +23,6 @@
*/
#include "config.h"
-
#include "web/LinkHighlight.h"
#include "bindings/core/v8/ExceptionStatePlaceholder.h"
@@ -50,9 +49,7 @@
#include "wtf/PassOwnPtr.h"
#include <gtest/gtest.h>
-using namespace blink;
-
-namespace {
+namespace blink {
GestureEventWithHitTestResults getTargetedEvent(WebViewImpl* webViewImpl, WebGestureEvent& touchEvent)
{
@@ -110,6 +107,8 @@ TEST(LinkHighlightTest, verifyWebViewImplIntegration)
Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
}
+namespace {
+
class FakeWebFrameClient : public WebFrameClient {
// To make the destructor public.
};
@@ -119,12 +118,14 @@ public:
FakeWebFrameClient m_fakeWebFrameClient;
};
-static WebViewClient* compositingWebViewClient()
+WebViewClient* compositingWebViewClient()
{
DEFINE_STATIC_LOCAL(FakeCompositingWebViewClient, client, ());
return &client;
}
+} // anonymous namespace
+
TEST(LinkHighlightTest, resetDuringNodeRemoval)
{
const std::string baseURL("http://www.test.com/");
@@ -193,4 +194,4 @@ TEST(LinkHighlightTest, multipleHighlights)
Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
}
-} // namespace
+} // namespace blink
« no previous file with comments | « Source/web/tests/LayoutGeometryMapTest.cpp ('k') | Source/web/tests/ListenerLeakTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698