| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_TEST_BASE_CHROME_RENDER_VIEW_TEST_H_ | 5 #ifndef CHROME_TEST_BASE_CHROME_RENDER_VIEW_TEST_H_ |
| 6 #define CHROME_TEST_BASE_CHROME_RENDER_VIEW_TEST_H_ | 6 #define CHROME_TEST_BASE_CHROME_RENDER_VIEW_TEST_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 class DispatcherDelegate; | 21 class DispatcherDelegate; |
| 22 } | 22 } |
| 23 | 23 |
| 24 class ChromeRenderViewTest : public content::RenderViewTest { | 24 class ChromeRenderViewTest : public content::RenderViewTest { |
| 25 public: | 25 public: |
| 26 ChromeRenderViewTest(); | 26 ChromeRenderViewTest(); |
| 27 virtual ~ChromeRenderViewTest(); | 27 virtual ~ChromeRenderViewTest(); |
| 28 | 28 |
| 29 protected: | 29 protected: |
| 30 // testing::Test | 30 // testing::Test |
| 31 virtual void SetUp() OVERRIDE; | 31 virtual void SetUp() override; |
| 32 virtual void TearDown() OVERRIDE; | 32 virtual void TearDown() override; |
| 33 virtual content::ContentClient* CreateContentClient() OVERRIDE; | 33 virtual content::ContentClient* CreateContentClient() override; |
| 34 virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE; | 34 virtual content::ContentBrowserClient* CreateContentBrowserClient() override; |
| 35 virtual content::ContentRendererClient* | 35 virtual content::ContentRendererClient* |
| 36 CreateContentRendererClient() OVERRIDE; | 36 CreateContentRendererClient() override; |
| 37 | 37 |
| 38 #if defined(ENABLE_EXTENSIONS) | 38 #if defined(ENABLE_EXTENSIONS) |
| 39 scoped_ptr<extensions::DispatcherDelegate> extension_dispatcher_delegate_; | 39 scoped_ptr<extensions::DispatcherDelegate> extension_dispatcher_delegate_; |
| 40 #endif | 40 #endif |
| 41 | 41 |
| 42 autofill::TestPasswordAutofillAgent* password_autofill_agent_; | 42 autofill::TestPasswordAutofillAgent* password_autofill_agent_; |
| 43 autofill::TestPasswordGenerationAgent* password_generation_; | 43 autofill::TestPasswordGenerationAgent* password_generation_; |
| 44 autofill::AutofillAgent* autofill_agent_; | 44 autofill::AutofillAgent* autofill_agent_; |
| 45 | 45 |
| 46 // Naked pointer as ownership is with content::RenderViewTest::render_thread_. | 46 // Naked pointer as ownership is with content::RenderViewTest::render_thread_. |
| 47 ChromeMockRenderThread* chrome_render_thread_; | 47 ChromeMockRenderThread* chrome_render_thread_; |
| 48 }; | 48 }; |
| 49 | 49 |
| 50 #endif // CHROME_TEST_BASE_CHROME_RENDER_VIEW_TEST_H_ | 50 #endif // CHROME_TEST_BASE_CHROME_RENDER_VIEW_TEST_H_ |
| OLD | NEW |