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

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

Issue 7831075: Delegating the "are images allowed" decision to renderer. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Test build fixes. Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "chrome/common/content_settings.h"
11 #include "chrome/renderer/autofill/autofill_agent.h" 12 #include "chrome/renderer/autofill/autofill_agent.h"
12 #include "chrome/renderer/chrome_mock_render_thread.h" 13 #include "chrome/renderer/chrome_mock_render_thread.h"
13 #include "chrome/renderer/chrome_content_renderer_client.h" 14 #include "chrome/renderer/chrome_content_renderer_client.h"
14 #include "content/test/render_view_test.h" 15 #include "content/test/render_view_test.h"
15 16
16 class ExtensionDispatcher; 17 class ExtensionDispatcher;
17 18
18 namespace autofill { 19 namespace autofill {
19 class AutofillAgent; 20 class AutofillAgent;
20 class PasswordAutofillManager; 21 class PasswordAutofillManager;
(...skipping 10 matching lines...) Expand all
31 virtual void TearDown(); 32 virtual void TearDown();
32 33
33 chrome::ChromeContentRendererClient chrome_content_renderer_client_; 34 chrome::ChromeContentRendererClient chrome_content_renderer_client_;
34 ExtensionDispatcher* extension_dispatcher_; 35 ExtensionDispatcher* extension_dispatcher_;
35 36
36 autofill::PasswordAutofillManager* password_autofill_; 37 autofill::PasswordAutofillManager* password_autofill_;
37 autofill::AutofillAgent* autofill_agent_; 38 autofill::AutofillAgent* autofill_agent_;
38 39
39 // Naked pointer as ownership is with content::RenderViewTest::render_thread_. 40 // Naked pointer as ownership is with content::RenderViewTest::render_thread_.
40 ChromeMockRenderThread* chrome_render_thread_; 41 ChromeMockRenderThread* chrome_render_thread_;
42
43 ContentSettingsForOneType image_setting_rules_;
41 }; 44 };
42 45
43 #endif // CHROME_TEST_BASE_CHROME_RENDER_VIEW_TEST_H_ 46 #endif // CHROME_TEST_BASE_CHROME_RENDER_VIEW_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698