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 #include "chrome/test/base/chrome_render_view_test.h" | 5 #include "chrome/test/base/chrome_render_view_test.h" |
6 | 6 |
7 #include "chrome/browser/extensions/extension_function_dispatcher.h" | 7 #include "chrome/browser/extensions/extension_function_dispatcher.h" |
8 #include "chrome/common/extensions/extension.h" | 8 #include "chrome/common/extensions/extension.h" |
9 #include "chrome/common/print_messages.h" | 9 #include "chrome/common/print_messages.h" |
10 #include "chrome/common/render_messages.h" | 10 #include "chrome/common/render_messages.h" |
11 #include "chrome/renderer/autofill/password_autofill_manager.h" | 11 #include "chrome/renderer/autofill/password_autofill_manager.h" |
12 #include "chrome/renderer/extensions/chrome_v8_context_set.h" | 12 #include "chrome/renderer/extensions/chrome_v8_context_set.h" |
13 #include "chrome/renderer/extensions/chrome_v8_extension.h" | 13 #include "chrome/renderer/extensions/chrome_v8_extension.h" |
| 14 #include "chrome/renderer/extensions/dispatcher.h" |
14 #include "chrome/renderer/extensions/event_bindings.h" | 15 #include "chrome/renderer/extensions/event_bindings.h" |
15 #include "chrome/renderer/extensions/extension_custom_bindings.h" | 16 #include "chrome/renderer/extensions/extension_custom_bindings.h" |
16 #include "chrome/renderer/extensions/extension_dispatcher.h" | |
17 #include "chrome/renderer/extensions/miscellaneous_bindings.h" | 17 #include "chrome/renderer/extensions/miscellaneous_bindings.h" |
18 #include "content/public/browser/native_web_keyboard_event.h" | 18 #include "content/public/browser/native_web_keyboard_event.h" |
19 #include "content/public/common/renderer_preferences.h" | 19 #include "content/public/common/renderer_preferences.h" |
20 #include "content/public/renderer/render_view.h" | 20 #include "content/public/renderer/render_view.h" |
21 #include "grit/renderer_resources.h" | 21 #include "grit/renderer_resources.h" |
22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" | 22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" | 24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h
" | 25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h
" |
26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" | 26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" |
(...skipping 19 matching lines...) Expand all Loading... |
46 | 46 |
47 ChromeRenderViewTest::ChromeRenderViewTest() : extension_dispatcher_(NULL) { | 47 ChromeRenderViewTest::ChromeRenderViewTest() : extension_dispatcher_(NULL) { |
48 } | 48 } |
49 | 49 |
50 ChromeRenderViewTest::~ChromeRenderViewTest() { | 50 ChromeRenderViewTest::~ChromeRenderViewTest() { |
51 } | 51 } |
52 | 52 |
53 void ChromeRenderViewTest::SetUp() { | 53 void ChromeRenderViewTest::SetUp() { |
54 content::GetContentClient()->set_renderer_for_testing( | 54 content::GetContentClient()->set_renderer_for_testing( |
55 &chrome_content_renderer_client_); | 55 &chrome_content_renderer_client_); |
56 extension_dispatcher_ = new ExtensionDispatcher(); | 56 extension_dispatcher_ = new extensions::Dispatcher(); |
57 chrome_content_renderer_client_.SetExtensionDispatcher(extension_dispatcher_); | 57 chrome_content_renderer_client_.SetExtensionDispatcher(extension_dispatcher_); |
58 | 58 |
59 chrome_render_thread_ = new ChromeMockRenderThread(); | 59 chrome_render_thread_ = new ChromeMockRenderThread(); |
60 render_thread_.reset(chrome_render_thread_); | 60 render_thread_.reset(chrome_render_thread_); |
61 content::RenderViewTest::SetUp(); | 61 content::RenderViewTest::SetUp(); |
62 | 62 |
63 // RenderView doesn't expose it's PasswordAutofillManager or | 63 // RenderView doesn't expose it's PasswordAutofillManager or |
64 // AutofillAgent objects, because it has no need to store them directly | 64 // AutofillAgent objects, because it has no need to store them directly |
65 // (they're stored as RenderViewObserver*). So just create another set. | 65 // (they're stored as RenderViewObserver*). So just create another set. |
66 password_autofill_ = new PasswordAutofillManager(view_); | 66 password_autofill_ = new PasswordAutofillManager(view_); |
67 autofill_agent_ = new AutofillAgent(view_, password_autofill_); | 67 autofill_agent_ = new AutofillAgent(view_, password_autofill_); |
68 } | 68 } |
69 | 69 |
70 void ChromeRenderViewTest::TearDown() { | 70 void ChromeRenderViewTest::TearDown() { |
71 content::RenderViewTest::TearDown(); | 71 content::RenderViewTest::TearDown(); |
72 | 72 |
73 extension_dispatcher_->OnRenderProcessShutdown(); | 73 extension_dispatcher_->OnRenderProcessShutdown(); |
74 extension_dispatcher_ = NULL; | 74 extension_dispatcher_ = NULL; |
75 } | 75 } |
OLD | NEW |