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

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

Issue 563313004: [Password Manager] Unfriend PasswordAutofillAgentTest from PasswordAutofillAgent (clean-up). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Unfriend PasswordAutofillAgentTest and RequestAutocompleteRendererTest from AutofillAgent. 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 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 #include "chrome/test/base/chrome_render_view_test.h" 5 #include "chrome/test/base/chrome_render_view_test.h"
6 6
7 #include "base/debug/leak_annotations.h" 7 #include "base/debug/leak_annotations.h"
8 #include "chrome/browser/chrome_content_browser_client.h" 8 #include "chrome/browser/chrome_content_browser_client.h"
9 #include "chrome/common/chrome_content_client.h" 9 #include "chrome/common/chrome_content_client.h"
10 #include "chrome/common/render_messages.h" 10 #include "chrome/common/render_messages.h"
11 #include "chrome/renderer/chrome_content_renderer_client.h" 11 #include "chrome/renderer/chrome_content_renderer_client.h"
12 #include "chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h" 12 #include "chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h"
13 #include "chrome/renderer/spellchecker/spellcheck.h" 13 #include "chrome/renderer/spellchecker/spellcheck.h"
14 #include "chrome/test/base/chrome_unit_test_suite.h" 14 #include "chrome/test/base/chrome_unit_test_suite.h"
15 #include "components/autofill/content/renderer/autofill_agent.h" 15 #include "components/autofill/content/renderer/autofill_agent.h"
vabr (Chromium) 2014/09/15 14:26:59 Do you still need this #include, when you add the
Pritam Nikam 2014/09/16 07:54:19 Done.
16 #include "components/autofill/content/renderer/password_autofill_agent.h" 16 #include "components/autofill/content/renderer/password_autofill_agent.h"
17 #include "components/autofill/content/renderer/test_autofill_agent.h"
17 #include "components/autofill/content/renderer/test_password_autofill_agent.h" 18 #include "components/autofill/content/renderer/test_password_autofill_agent.h"
18 #include "components/autofill/content/renderer/test_password_generation_agent.h" 19 #include "components/autofill/content/renderer/test_password_generation_agent.h"
19 #include "content/public/browser/native_web_keyboard_event.h" 20 #include "content/public/browser/native_web_keyboard_event.h"
20 #include "content/public/common/renderer_preferences.h" 21 #include "content/public/common/renderer_preferences.h"
21 #include "content/public/renderer/render_view.h" 22 #include "content/public/renderer/render_view.h"
22 #include "extensions/browser/extension_function_dispatcher.h" 23 #include "extensions/browser/extension_function_dispatcher.h"
23 #include "extensions/common/extension.h" 24 #include "extensions/common/extension.h"
24 #include "extensions/renderer/dispatcher.h" 25 #include "extensions/renderer/dispatcher.h"
25 #include "extensions/renderer/event_bindings.h" 26 #include "extensions/renderer/event_bindings.h"
26 #include "third_party/WebKit/public/platform/WebURLRequest.h" 27 #include "third_party/WebKit/public/platform/WebURLRequest.h"
27 #include "third_party/WebKit/public/web/WebFrame.h" 28 #include "third_party/WebKit/public/web/WebFrame.h"
28 #include "third_party/WebKit/public/web/WebInputEvent.h" 29 #include "third_party/WebKit/public/web/WebInputEvent.h"
29 #include "third_party/WebKit/public/web/WebKit.h" 30 #include "third_party/WebKit/public/web/WebKit.h"
30 #include "third_party/WebKit/public/web/WebScriptController.h" 31 #include "third_party/WebKit/public/web/WebScriptController.h"
31 #include "third_party/WebKit/public/web/WebScriptSource.h" 32 #include "third_party/WebKit/public/web/WebScriptSource.h"
32 #include "third_party/WebKit/public/web/WebView.h" 33 #include "third_party/WebKit/public/web/WebView.h"
33 34
34 using blink::WebFrame; 35 using blink::WebFrame;
35 using blink::WebInputEvent; 36 using blink::WebInputEvent;
36 using blink::WebMouseEvent; 37 using blink::WebMouseEvent;
37 using blink::WebScriptController; 38 using blink::WebScriptController;
38 using blink::WebScriptSource; 39 using blink::WebScriptSource;
39 using blink::WebString; 40 using blink::WebString;
40 using blink::WebURLRequest; 41 using blink::WebURLRequest;
41 using autofill::AutofillAgent; 42 using autofill::TestAutofillAgent;
vabr (Chromium) 2014/09/15 14:26:59 nit: alphabetise
Pritam Nikam 2014/09/16 07:54:19 Done.
42 using autofill::PasswordAutofillAgent; 43 using autofill::PasswordAutofillAgent;
43 using autofill::PasswordGenerationAgent; 44 using autofill::PasswordGenerationAgent;
44 45
45 ChromeRenderViewTest::ChromeRenderViewTest() 46 ChromeRenderViewTest::ChromeRenderViewTest()
46 : password_autofill_(NULL), 47 : password_autofill_(NULL),
47 password_generation_(NULL), 48 password_generation_(NULL),
48 autofill_agent_(NULL), 49 autofill_agent_(NULL),
49 chrome_render_thread_(NULL) { 50 chrome_render_thread_(NULL) {
50 } 51 }
51 52
52 ChromeRenderViewTest::~ChromeRenderViewTest() { 53 ChromeRenderViewTest::~ChromeRenderViewTest() {
53 } 54 }
54 55
55 void ChromeRenderViewTest::SetUp() { 56 void ChromeRenderViewTest::SetUp() {
56 ChromeUnitTestSuite::InitializeProviders(); 57 ChromeUnitTestSuite::InitializeProviders();
57 ChromeUnitTestSuite::InitializeResourceBundle(); 58 ChromeUnitTestSuite::InitializeResourceBundle();
58 59
59 chrome_render_thread_ = new ChromeMockRenderThread(); 60 chrome_render_thread_ = new ChromeMockRenderThread();
60 render_thread_.reset(chrome_render_thread_); 61 render_thread_.reset(chrome_render_thread_);
61 62
62 content::RenderViewTest::SetUp(); 63 content::RenderViewTest::SetUp();
63 64
64 // RenderView doesn't expose its Agent objects, because it has no need to 65 // RenderView doesn't expose its Agent objects, because it has no need to
65 // store them directly (they're stored as RenderViewObserver*). So just 66 // store them directly (they're stored as RenderViewObserver*). So just
66 // create another set. 67 // create another set.
67 password_autofill_ = new autofill::TestPasswordAutofillAgent(view_); 68 password_autofill_ = new autofill::TestPasswordAutofillAgent(view_);
68 password_generation_ = new autofill::TestPasswordGenerationAgent(view_); 69 password_generation_ = new autofill::TestPasswordGenerationAgent(view_);
69 autofill_agent_ = 70 autofill_agent_ =
70 new AutofillAgent(view_, password_autofill_, password_generation_); 71 new TestAutofillAgent(view_, password_autofill_, password_generation_);
71 } 72 }
72 73
73 void ChromeRenderViewTest::TearDown() { 74 void ChromeRenderViewTest::TearDown() {
74 ChromeContentRendererClient* client = 75 ChromeContentRendererClient* client =
75 static_cast<ChromeContentRendererClient*>(content_renderer_client_.get()); 76 static_cast<ChromeContentRendererClient*>(content_renderer_client_.get());
76 client->GetExtensionDispatcherForTest()->OnRenderProcessShutdown(); 77 client->GetExtensionDispatcherForTest()->OnRenderProcessShutdown();
77 78
78 #if defined(LEAK_SANITIZER) 79 #if defined(LEAK_SANITIZER)
79 // Do this before shutting down V8 in RenderViewTest::TearDown(). 80 // Do this before shutting down V8 in RenderViewTest::TearDown().
80 // http://crbug.com/328552 81 // http://crbug.com/328552
(...skipping 16 matching lines...) Expand all
97 extension_dispatcher_delegate_.reset( 98 extension_dispatcher_delegate_.reset(
98 new ChromeExtensionsDispatcherDelegate()); 99 new ChromeExtensionsDispatcherDelegate());
99 ChromeContentRendererClient* client = new ChromeContentRendererClient(); 100 ChromeContentRendererClient* client = new ChromeContentRendererClient();
100 client->SetExtensionDispatcherForTest( 101 client->SetExtensionDispatcherForTest(
101 new extensions::Dispatcher(extension_dispatcher_delegate_.get())); 102 new extensions::Dispatcher(extension_dispatcher_delegate_.get()));
102 #if defined(ENABLE_SPELLCHECK) 103 #if defined(ENABLE_SPELLCHECK)
103 client->SetSpellcheck(new SpellCheck()); 104 client->SetSpellcheck(new SpellCheck());
104 #endif 105 #endif
105 return client; 106 return client;
106 } 107 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698