webkit/tools/test_shell/test_shell_main.cc - Issue 6312156: Change includes of gfx/* to ui/gfx/*

Side by Side Diff: webkit/tools/test_shell/test_shell_main.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 10 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

« no previous file with comments | « webkit/tools/test_shell/test_shell_mac.mm ('k') | webkit/tools/test_shell/test_shell_platform_delegate_win.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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 "app/app_switches.h"	5 #include "app/app_switches.h"

6 #include "app/gfx/gl/gl_implementation.h"	6 #include "app/gfx/gl/gl_implementation.h"

7 #include "base/at_exit.h"	7 #include "base/at_exit.h"

8 #include "base/basictypes.h"	8 #include "base/basictypes.h"

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #include "base/debug/trace_event.h"	10 #include "base/debug/trace_event.h"

11 #include "base/environment.h"	11 #include "base/environment.h"

12 #include "base/event_recorder.h"	12 #include "base/event_recorder.h"

13 #include "base/file_path.h"	13 #include "base/file_path.h"

14 #include "base/file_util.h"	14 #include "base/file_util.h"

15 #include "base/i18n/icu_util.h"	15 #include "base/i18n/icu_util.h"

16 #include "base/memory_debug.h"	16 #include "base/memory_debug.h"

17 #include "base/message_loop.h"	17 #include "base/message_loop.h"

18 #include "base/metrics/stats_table.h"	18 #include "base/metrics/stats_table.h"

19 #include "base/path_service.h"	19 #include "base/path_service.h"

20 #include "base/process_util.h"	20 #include "base/process_util.h"

21 #include "base/rand_util.h"	21 #include "base/rand_util.h"

22 #include "base/string_number_conversions.h"	22 #include "base/string_number_conversions.h"

23 #include "base/sys_info.h"	23 #include "base/sys_info.h"

24 #include "base/utf_string_conversions.h"	24 #include "base/utf_string_conversions.h"

25 #include "gfx/gfx_module.h"

26 #include "net/base/cookie_monster.h"	25 #include "net/base/cookie_monster.h"

27 #include "net/base/net_module.h"	26 #include "net/base/net_module.h"

28 #include "net/base/net_util.h"	27 #include "net/base/net_util.h"

29 #include "net/http/http_cache.h"	28 #include "net/http/http_cache.h"

30 #include "net/http/http_util.h"	29 #include "net/http/http_util.h"

31 #include "net/test/test_server.h"	30 #include "net/test/test_server.h"

32 #include "net/url_request/url_request_context.h"	31 #include "net/url_request/url_request_context.h"

33 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"	32 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"

34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h "	33 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h "

	34 #include "ui/gfx/gfx_module.h"

35 #include "webkit/glue/webkit_glue.h"	35 #include "webkit/glue/webkit_glue.h"

36 #include "webkit/glue/window_open_disposition.h"	36 #include "webkit/glue/window_open_disposition.h"

37 #include "webkit/extensions/v8/gc_extension.h"	37 #include "webkit/extensions/v8/gc_extension.h"

38 #include "webkit/extensions/v8/heap_profiler_extension.h"	38 #include "webkit/extensions/v8/heap_profiler_extension.h"

39 #include "webkit/extensions/v8/playback_extension.h"	39 #include "webkit/extensions/v8/playback_extension.h"

40 #include "webkit/extensions/v8/profiler_extension.h"	40 #include "webkit/extensions/v8/profiler_extension.h"

41 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"	41 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"

42 #include "webkit/tools/test_shell/test_shell.h"	42 #include "webkit/tools/test_shell/test_shell.h"

43 #include "webkit/tools/test_shell/test_shell_platform_delegate.h"	43 #include "webkit/tools/test_shell/test_shell_platform_delegate.h"

44 #include "webkit/tools/test_shell/test_shell_request_context.h"	44 #include "webkit/tools/test_shell/test_shell_request_context.h"

(...skipping 303 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
348 TestShell::ShutdownTestShell();	348 TestShell::ShutdownTestShell();

349 TestShell::CleanupLogging();	349 TestShell::CleanupLogging();

350	350

351 // Tear down shared StatsTable; prevents unit_tests from leaking it.	351 // Tear down shared StatsTable; prevents unit_tests from leaking it.

352 base::StatsTable::set_current(NULL);	352 base::StatsTable::set_current(NULL);

353 delete table;	353 delete table;

354 RemoveSharedMemoryFile(stats_filename);	354 RemoveSharedMemoryFile(stats_filename);

355	355

356 return 0;	356 return 0;

357 }	357 }

OLD	NEW