Index: content/browser/renderer_host/render_view_host_unittest.cc |
=================================================================== |
--- content/browser/renderer_host/render_view_host_unittest.cc (revision 164665) |
+++ content/browser/renderer_host/render_view_host_unittest.cc (working copy) |
@@ -17,8 +17,7 @@ |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" |
#include "webkit/glue/webdropdata.h" |
-using content::RenderViewHostImplTestHarness; |
-using content::TestWebContents; |
+namespace content { |
class RenderViewHostTest : public RenderViewHostImplTestHarness { |
}; |
@@ -59,7 +58,7 @@ |
NavigateAndCommit(url1); |
controller().LoadURL( |
- url2, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string()); |
+ url2, Referrer(), PAGE_TRANSITION_LINK, std::string()); |
// Simulate the ClosePage call which is normally sent by the net::URLRequest. |
rvh()->ClosePage(); |
// Needed so that navigations are not suspended on the RVH. |
@@ -75,17 +74,17 @@ |
scoped_ptr<TestWebContents> new_web_contents( |
TestWebContents::Create(browser_context(), rvh()->GetSiteInstance())); |
- rvh()->AllowBindings(content::BINDINGS_POLICY_WEB_UI); |
- EXPECT_FALSE(rvh()->GetEnabledBindings() & content::BINDINGS_POLICY_WEB_UI); |
+ rvh()->AllowBindings(BINDINGS_POLICY_WEB_UI); |
+ EXPECT_FALSE(rvh()->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI); |
} |
class MockDraggingRenderViewHostDelegateView |
- : public content::RenderViewHostDelegateView { |
+ : public RenderViewHostDelegateView { |
public: |
virtual ~MockDraggingRenderViewHostDelegateView() {} |
virtual void ShowContextMenu( |
- const content::ContextMenuParams& params, |
- content::ContextMenuSourceType type) OVERRIDE {} |
+ const ContextMenuParams& params, |
+ ContextMenuSourceType type) OVERRIDE {} |
virtual void ShowPopupMenu(const gfx::Rect& bounds, |
int item_height, |
double item_font_size, |
@@ -225,3 +224,5 @@ |
} |
#endif |
+ |
+} // namespace content |