chrome/test/base/chrome_render_view_test.h - Issue 559103003: Cleanup: Remove Dispatcher and UserScript classes from builds where extensions are disabled.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 559103003: Cleanup: Remove Dispatcher and UserScript classes from builds where extensions are disabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « chrome/renderer/pepper/pepper_uma_host.cc ('k') | chrome/test/base/chrome_render_view_test.cc » ('j') | no next file with comments »

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 #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 "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

(...skipping 17 matching lines...) Expand all Loading...
28	28

29 protected:	29 protected:

30 // testing::Test	30 // testing::Test

31 virtual void SetUp() OVERRIDE;	31 virtual void SetUp() OVERRIDE;

32 virtual void TearDown() OVERRIDE;	32 virtual void TearDown() OVERRIDE;

33 virtual content::ContentClient* CreateContentClient() OVERRIDE;	33 virtual content::ContentClient* CreateContentClient() OVERRIDE;

34 virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;	34 virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;

35 virtual content::ContentRendererClient*	35 virtual content::ContentRendererClient*

36 CreateContentRendererClient() OVERRIDE;	36 CreateContentRendererClient() OVERRIDE;

37	37

	38 #if defined(ENABLE_EXTENSIONS)

38 scoped_ptr<extensions::DispatcherDelegate> extension_dispatcher_delegate_;	39 scoped_ptr<extensions::DispatcherDelegate> extension_dispatcher_delegate_;

	40 #endif

39	41

40 autofill::TestPasswordAutofillAgent* password_autofill_;	42 autofill::TestPasswordAutofillAgent* password_autofill_;

41 autofill::TestPasswordGenerationAgent* password_generation_;	43 autofill::TestPasswordGenerationAgent* password_generation_;

42 autofill::AutofillAgent* autofill_agent_;	44 autofill::AutofillAgent* autofill_agent_;

43	45

44 // Naked pointer as ownership is with content::RenderViewTest::render_thread_.	46 // Naked pointer as ownership is with content::RenderViewTest::render_thread_.

45 ChromeMockRenderThread* chrome_render_thread_;	47 ChromeMockRenderThread* chrome_render_thread_;

46 };	48 };

47	49

48 #endif // CHROME_TEST_BASE_CHROME_RENDER_VIEW_TEST_H_	50 #endif // CHROME_TEST_BASE_CHROME_RENDER_VIEW_TEST_H_

OLD	NEW