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

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

Issue 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix CrOS tests Created 6 years, 4 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 | Annotate | Revision Log
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/content_settings_component.h"
10 #include "chrome/common/render_messages.h" 11 #include "chrome/common/render_messages.h"
11 #include "chrome/renderer/chrome_content_renderer_client.h" 12 #include "chrome/renderer/chrome_content_renderer_client.h"
12 #include "chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h" 13 #include "chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h"
13 #include "chrome/renderer/spellchecker/spellcheck.h" 14 #include "chrome/renderer/spellchecker/spellcheck.h"
14 #include "chrome/test/base/chrome_unit_test_suite.h" 15 #include "chrome/test/base/chrome_unit_test_suite.h"
15 #include "components/autofill/content/renderer/autofill_agent.h" 16 #include "components/autofill/content/renderer/autofill_agent.h"
16 #include "components/autofill/content/renderer/password_autofill_agent.h" 17 #include "components/autofill/content/renderer/password_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"
(...skipping 28 matching lines...) Expand all
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();
59 InitContentSettingsComponent();
58 60
59 chrome_render_thread_ = new ChromeMockRenderThread(); 61 chrome_render_thread_ = new ChromeMockRenderThread();
60 render_thread_.reset(chrome_render_thread_); 62 render_thread_.reset(chrome_render_thread_);
61 63
62 content::RenderViewTest::SetUp(); 64 content::RenderViewTest::SetUp();
63 65
64 // RenderView doesn't expose its Agent objects, because it has no need to 66 // RenderView doesn't expose its Agent objects, because it has no need to
65 // store them directly (they're stored as RenderViewObserver*). So just 67 // store them directly (they're stored as RenderViewObserver*). So just
66 // create another set. 68 // create another set.
67 password_autofill_ = new autofill::TestPasswordAutofillAgent(view_); 69 password_autofill_ = new autofill::TestPasswordAutofillAgent(view_);
(...skipping 29 matching lines...) Expand all
97 extension_dispatcher_delegate_.reset( 99 extension_dispatcher_delegate_.reset(
98 new ChromeExtensionsDispatcherDelegate()); 100 new ChromeExtensionsDispatcherDelegate());
99 ChromeContentRendererClient* client = new ChromeContentRendererClient(); 101 ChromeContentRendererClient* client = new ChromeContentRendererClient();
100 client->SetExtensionDispatcherForTest( 102 client->SetExtensionDispatcherForTest(
101 new extensions::Dispatcher(extension_dispatcher_delegate_.get())); 103 new extensions::Dispatcher(extension_dispatcher_delegate_.get()));
102 #if defined(ENABLE_SPELLCHECK) 104 #if defined(ENABLE_SPELLCHECK)
103 client->SetSpellcheck(new SpellCheck()); 105 client->SetSpellcheck(new SpellCheck());
104 #endif 106 #endif
105 return client; 107 return client;
106 } 108 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698