Chromium Code Reviews| Index: ui/views/controls/webview/webview_interactive_uitest.cc |
| diff --git a/ui/views/controls/webview/webview_interactive_uitest.cc b/ui/views/controls/webview/webview_interactive_uitest.cc |
| index e13b24ea1c0f120f244cd9c4342b1ba9c474610d..257acf1da0c5470af2032df248b7cf564e1b06a0 100644 |
| --- a/ui/views/controls/webview/webview_interactive_uitest.cc |
| +++ b/ui/views/controls/webview/webview_interactive_uitest.cc |
| @@ -23,12 +23,12 @@ namespace { |
| class WebViewTestViewsDelegate : public views::TestViewsDelegate { |
| public: |
| - WebViewTestViewsDelegate() {} |
| + WebViewTestViewsDelegate() { } |
| // Overriden from TestViewsDelegate. |
| content::WebContents* CreateWebContents( |
| content::BrowserContext* browser_context, |
| - content::SiteInstance* site_instance) override { |
| + content::SiteInstance* site_instance)override { |
|
Charlie Reis
2015/06/04 22:27:31
Something weird happened with all this formatting.
nasko
2015/06/04 23:38:36
Done.
|
| return content::WebContentsTester::CreateTestWebContents(browser_context, |
| site_instance); |
| } |
| @@ -40,9 +40,9 @@ class WebViewTestViewsDelegate : public views::TestViewsDelegate { |
| class WebViewInteractiveUiTest : public views::test::WidgetTest { |
| public: |
| WebViewInteractiveUiTest() |
| - : ui_thread_(content::BrowserThread::UI, base::MessageLoop::current()) {} |
| + : ui_thread_(content::BrowserThread::UI, base::MessageLoop::current()) { } |
| - void SetUp() override { |
| + void SetUp()override { |
| gfx::GLSurface::InitializeOneOffForTests(); |
| // The ViewsDelegate is deleted when the ViewsTestBase class is torn down. |
| WidgetTest::set_views_delegate(new WebViewTestViewsDelegate); |
| @@ -92,8 +92,8 @@ TEST_F(WebViewInteractiveUiTest, TextInputClientIsUpToDate) { |
| content::WebContents* web_contents1 = webview->GetWebContents(); |
| web_contents1->GetRenderViewHost()->GetProcess()->Init(); |
| content::RenderViewHostTester::For(web_contents1->GetRenderViewHost()) |
| - ->CreateRenderView(base::string16(), MSG_ROUTING_NONE, MSG_ROUTING_NONE, |
| - -1, false); |
| + ->CreateTestRenderView(base::string16(), MSG_ROUTING_NONE, |
| + MSG_ROUTING_NONE, -1, false); |
| webview->RequestFocus(); |
| ui::TextInputClient* client1 = webview->GetTextInputClient(); |
| EXPECT_NE(nullptr, client1); |
| @@ -105,8 +105,8 @@ TEST_F(WebViewInteractiveUiTest, TextInputClientIsUpToDate) { |
| nullptr)); |
| web_contents2->GetRenderViewHost()->GetProcess()->Init(); |
| content::RenderViewHostTester::For(web_contents2->GetRenderViewHost()) |
| - ->CreateRenderView(base::string16(), MSG_ROUTING_NONE, MSG_ROUTING_NONE, |
| - -1, false); |
| + ->CreateTestRenderView(base::string16(), MSG_ROUTING_NONE, |
| + MSG_ROUTING_NONE, -1, false); |
| webview->SetWebContents(web_contents2.get()); |
| ui::TextInputClient* client2 = webview->GetTextInputClient(); |
| EXPECT_NE(nullptr, client2); |