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

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

Issue 545123002: Cleanup namespace usage in Source/web/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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/TouchActionTest.cpp ('k') | Source/web/tests/WebDocumentTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/ViewportTest.cpp
diff --git a/Source/web/tests/ViewportTest.cpp b/Source/web/tests/ViewportTest.cpp
index 6190f0117e7e499faf406d1410af8f0c3d46e165..3800cf96e5bfc4a70fba53556d7a116b006b8778 100644
--- a/Source/web/tests/ViewportTest.cpp
+++ b/Source/web/tests/ViewportTest.cpp
@@ -55,19 +55,11 @@
#include <vector>
-using namespace blink;
-using blink::LocalFrame;
-using blink::FrameView;
-using blink::IntPoint;
-using blink::IntRect;
-using blink::IntSize;
-using blink::Page;
-using blink::PageScaleConstraints;
-using blink::ViewportDescription;
-using blink::FrameTestHelpers::runPendingTasks;
-
namespace {
+using blink::FrameTestHelpers::runPendingTasks;
+using namespace blink;
+
class ViewportTest : public testing::Test {
protected:
ViewportTest()
@@ -105,15 +97,15 @@ class UseMockScrollbarSettings {
public:
UseMockScrollbarSettings()
{
- blink::Settings::setMockScrollbarsEnabled(true);
- blink::RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
- EXPECT_TRUE(blink::ScrollbarTheme::theme()->usesOverlayScrollbars());
+ Settings::setMockScrollbarsEnabled(true);
+ RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
+ EXPECT_TRUE(ScrollbarTheme::theme()->usesOverlayScrollbars());
}
~UseMockScrollbarSettings()
{
- blink::Settings::setMockScrollbarsEnabled(false);
- blink::RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false);
+ Settings::setMockScrollbarsEnabled(false);
+ RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false);
}
};
@@ -129,7 +121,7 @@ static PageScaleConstraints runViewportTest(Page* page, int initialWidth, int in
IntSize initialViewportSize(initialWidth, initialHeight);
toLocalFrame(page->mainFrame())->view()->setFrameRect(IntRect(IntPoint::zero(), initialViewportSize));
ViewportDescription description = page->viewportDescription();
- PageScaleConstraints constraints = description.resolve(initialViewportSize, blink::Length(980, blink::Fixed));
+ PageScaleConstraints constraints = description.resolve(initialViewportSize, Length(980, blink::Fixed));
constraints.fitToContentsWidth(constraints.layoutSize.width(), initialWidth);
return constraints;
« no previous file with comments | « Source/web/tests/TouchActionTest.cpp ('k') | Source/web/tests/WebDocumentTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698