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

Side by Side Diff: chrome/test/base/chrome_render_view_test.h

Issue 151503006: Re-land r248110 with ASAN error fixed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Punctuation Created 6 years, 10 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 unified diff | Download patch
OLDNEW
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 "chrome/renderer/chrome_content_renderer_client.h" 10 #include "chrome/renderer/chrome_content_renderer_client.h"
11 #include "chrome/renderer/chrome_mock_render_thread.h" 11 #include "chrome/renderer/chrome_mock_render_thread.h"
12 #include "content/public/test/render_view_test.h" 12 #include "content/public/test/render_view_test.h"
13 13
14 namespace autofill { 14 namespace autofill {
15 class AutofillAgent; 15 class AutofillAgent;
16 class TestPasswordAutofillAgent; 16 class TestPasswordAutofillAgent;
17 class TestPasswordGenerationAgent;
17 } 18 }
18 19
19 namespace extensions { 20 namespace extensions {
20 class Dispatcher; 21 class Dispatcher;
21 } 22 }
22 23
23 class ChromeRenderViewTest : public content::RenderViewTest { 24 class ChromeRenderViewTest : public content::RenderViewTest {
24 public: 25 public:
25 ChromeRenderViewTest(); 26 ChromeRenderViewTest();
26 virtual ~ChromeRenderViewTest(); 27 virtual ~ChromeRenderViewTest();
27 28
28 protected: 29 protected:
29 // testing::Test 30 // testing::Test
30 virtual void SetUp() OVERRIDE; 31 virtual void SetUp() OVERRIDE;
31 virtual void TearDown() OVERRIDE; 32 virtual void TearDown() OVERRIDE;
32 33
33 ChromeContentRendererClient chrome_content_renderer_client_; 34 ChromeContentRendererClient chrome_content_renderer_client_;
34 extensions::Dispatcher* extension_dispatcher_; 35 extensions::Dispatcher* extension_dispatcher_;
35 36
36 autofill::TestPasswordAutofillAgent* password_autofill_; 37 autofill::TestPasswordAutofillAgent* password_autofill_;
38 autofill::TestPasswordGenerationAgent* password_generation_;
37 autofill::AutofillAgent* autofill_agent_; 39 autofill::AutofillAgent* autofill_agent_;
38 40
39 // Naked pointer as ownership is with content::RenderViewTest::render_thread_. 41 // Naked pointer as ownership is with content::RenderViewTest::render_thread_.
40 ChromeMockRenderThread* chrome_render_thread_; 42 ChromeMockRenderThread* chrome_render_thread_;
41 }; 43 };
42 44
43 #endif // CHROME_TEST_BASE_CHROME_RENDER_VIEW_TEST_H_ 45 #endif // CHROME_TEST_BASE_CHROME_RENDER_VIEW_TEST_H_
OLDNEW
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.cc ('k') | chrome/test/base/chrome_render_view_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698