webkit/support/webkit_support.cc - Issue 18191004: webkit: Migrate from googleurl/ includes to url/ ones.

Side by Side Diff: webkit/support/webkit_support.cc

Issue 18191004: webkit: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sync+rebase Created 7 years, 5 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/support/test_shell_webblobregistry_impl.cc ('k') | no next file » | 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 #include "webkit/support/webkit_support.h"	5 #include "webkit/support/webkit_support.h"

6	6

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

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

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

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

11 #include "base/debug/debugger.h"	11 #include "base/debug/debugger.h"

12 #include "base/debug/stack_trace.h"	12 #include "base/debug/stack_trace.h"

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

14 #include "base/files/file_path.h"	14 #include "base/files/file_path.h"

15 #include "base/files/scoped_temp_dir.h"	15 #include "base/files/scoped_temp_dir.h"

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

17 #include "base/memory/ref_counted.h"	17 #include "base/memory/ref_counted.h"

18 #include "base/memory/weak_ptr.h"	18 #include "base/memory/weak_ptr.h"

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

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

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

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

23 #include "base/strings/string_piece.h"	23 #include "base/strings/string_piece.h"

24 #include "base/strings/string_util.h"	24 #include "base/strings/string_util.h"

25 #include "base/strings/stringprintf.h"	25 #include "base/strings/stringprintf.h"

26 #include "base/strings/sys_string_conversions.h"	26 #include "base/strings/sys_string_conversions.h"

27 #include "base/strings/utf_string_conversions.h"	27 #include "base/strings/utf_string_conversions.h"

28 #include "base/time/time.h"	28 #include "base/time/time.h"

29 #include "googleurl/src/url_util.h"

30 #include "grit/webkit_chromium_resources.h"	29 #include "grit/webkit_chromium_resources.h"

31 #include "net/base/escape.h"	30 #include "net/base/escape.h"

32 #include "net/base/net_errors.h"	31 #include "net/base/net_errors.h"

33 #include "net/base/net_util.h"	32 #include "net/base/net_util.h"

34 #include "testing/gtest/include/gtest/gtest.h"	33 #include "testing/gtest/include/gtest/gtest.h"

	34 #include "third_party/WebKit/public/platform/WebStorageNamespace.h"

	35 #include "third_party/WebKit/public/platform/WebURLError.h"

35 #include "third_party/WebKit/public/web/WebCache.h"	36 #include "third_party/WebKit/public/web/WebCache.h"

36 #include "third_party/WebKit/public/web/WebFileSystemCallbacks.h"	37 #include "third_party/WebKit/public/web/WebFileSystemCallbacks.h"

37 #include "third_party/WebKit/public/web/WebKit.h"	38 #include "third_party/WebKit/public/web/WebKit.h"

38 #include "third_party/WebKit/public/web/WebPluginParams.h"	39 #include "third_party/WebKit/public/web/WebPluginParams.h"

39 #include "third_party/WebKit/public/web/WebView.h"	40 #include "third_party/WebKit/public/web/WebView.h"

40 #include "third_party/WebKit/public/platform/WebStorageNamespace.h"	41 #include "url/url_util.h"

41 #include "third_party/WebKit/public/platform/WebURLError.h"

42 #if defined(TOOLKIT_GTK)	42 #if defined(TOOLKIT_GTK)

43 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"	43 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"

44 #endif	44 #endif

45 #include "ui/gl/gl_context.h"	45 #include "ui/gl/gl_context.h"

46 #include "ui/gl/gl_implementation.h"	46 #include "ui/gl/gl_implementation.h"

47 #include "ui/gl/gl_surface.h"	47 #include "ui/gl/gl_surface.h"

48 #include "webkit/browser/fileapi/isolated_context.h"	48 #include "webkit/browser/fileapi/isolated_context.h"

49 #include "webkit/child/webthread_impl.h"	49 #include "webkit/child/webthread_impl.h"

50 #include "webkit/common/gpu/test_context_provider_factory.h"	50 #include "webkit/common/gpu/test_context_provider_factory.h"

51 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl. h"	51 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl. h"

(...skipping 632 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
684 // Logging	684 // Logging

685 void EnableWebCoreLogChannels(const std::string& channels) {	685 void EnableWebCoreLogChannels(const std::string& channels) {

686 webkit_glue::EnableWebCoreLogChannels(channels);	686 webkit_glue::EnableWebCoreLogChannels(channels);

687 }	687 }

688	688

689 void SetGamepadData(const WebKit::WebGamepads& pads) {	689 void SetGamepadData(const WebKit::WebGamepads& pads) {

690 test_environment->webkit_platform_support()->setGamepadData(pads);	690 test_environment->webkit_platform_support()->setGamepadData(pads);

691 }	691 }

692	692

693 } // namespace webkit_support	693 } // namespace webkit_support

OLD	NEW