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

Unified Diff: Source/web/tests/ChromeClientImplTest.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/ActivityLoggerTest.cpp ('k') | Source/web/tests/CustomEventTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/ChromeClientImplTest.cpp
diff --git a/Source/web/tests/ChromeClientImplTest.cpp b/Source/web/tests/ChromeClientImplTest.cpp
index 2ad4c51fac2334e8e39ba544000c8602d2507ba7..6dbafb4a5706bbc007ef0f87a3627ad50bf30599 100644
--- a/Source/web/tests/ChromeClientImplTest.cpp
+++ b/Source/web/tests/ChromeClientImplTest.cpp
@@ -40,8 +40,6 @@
#include "web/tests/FrameTestHelpers.h"
#include <gtest/gtest.h>
-using namespace blink;
-
namespace blink {
void setCurrentInputEventForTest(const WebInputEvent* event)
@@ -49,16 +47,14 @@ void setCurrentInputEventForTest(const WebInputEvent* event)
WebViewImpl::m_currentInputEvent = event;
}
-}
-
namespace {
class TestWebViewClient : public FrameTestHelpers::TestWebViewClient {
public:
explicit TestWebViewClient(WebNavigationPolicy* target) : m_target(target) { }
- ~TestWebViewClient() { }
+ ~TestWebViewClient() override { }
- virtual void show(WebNavigationPolicy policy)
+ void show(WebNavigationPolicy policy) override
{
*m_target = policy;
}
@@ -69,9 +65,11 @@ private:
class TestWebFrameClient : public WebFrameClient {
public:
- ~TestWebFrameClient() { }
+ ~TestWebFrameClient() override { }
};
+} // anonymous namespace
+
class GetNavigationPolicyTest : public testing::Test {
public:
GetNavigationPolicyTest()
@@ -81,7 +79,7 @@ public:
}
protected:
- virtual void SetUp()
+ void SetUp() override
{
m_webView = toWebViewImpl(WebView::create(&m_webViewClient));
m_mainFrame = WebLocalFrame::create(WebTreeScopeType::Document, &m_webFrameClient);
@@ -90,7 +88,7 @@ protected:
m_result = WebNavigationPolicyIgnore;
}
- virtual void TearDown()
+ void TearDown() override
{
m_webView->close();
m_mainFrame->close();
@@ -264,4 +262,4 @@ TEST_F(GetNavigationPolicyTest, NotResizableForcesPopup)
EXPECT_FALSE(isNavigationPolicyPopup());
}
-} // namespace
+} // namespace blink
« no previous file with comments | « Source/web/tests/ActivityLoggerTest.cpp ('k') | Source/web/tests/CustomEventTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698