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

Side by Side Diff: webkit/support/platform_support_android.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
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 "webkit/support/platform_support.h" 5 #include "webkit/support/platform_support.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
13 #include "base/strings/string_piece.h" 13 #include "base/strings/string_piece.h"
14 #include "base/test/test_support_android.h" 14 #include "base/test/test_support_android.h"
15 #include "googleurl/src/gurl.h"
16 #include "grit/webkit_resources.h" 15 #include "grit/webkit_resources.h"
17 #include "media/base/android/media_jni_registrar.h" 16 #include "media/base/android/media_jni_registrar.h"
18 #include "net/android/net_jni_registrar.h" 17 #include "net/android/net_jni_registrar.h"
19 #include "net/android/network_library.h" 18 #include "net/android/network_library.h"
20 #include "ui/android/ui_jni_registrar.h" 19 #include "ui/android/ui_jni_registrar.h"
21 #include "ui/base/resource/resource_bundle.h" 20 #include "ui/base/resource/resource_bundle.h"
22 #include "ui/gl/android/gl_jni_registrar.h" 21 #include "ui/gl/android/gl_jni_registrar.h"
22 #include "url/gurl.h"
23 #include "webkit/support/test_webkit_platform_support.h" 23 #include "webkit/support/test_webkit_platform_support.h"
24 24
25 namespace { 25 namespace {
26 26
27 // The place where the Android layout test script will put the required tools 27 // The place where the Android layout test script will put the required tools
28 // and resources. Must keep consistent with DEVICE_DRT_DIR in 28 // and resources. Must keep consistent with DEVICE_DRT_DIR in
29 // WebKit/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py. 29 // WebKit/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py.
30 const char kDumpRenderTreeDir[] = "/data/local/tmp/drt"; 30 const char kDumpRenderTreeDir[] = "/data/local/tmp/drt";
31 31
32 } 32 }
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 if (!success) 92 if (!success)
93 LOG(FATAL) << "Failed reading: " << path.value(); 93 LOG(FATAL) << "Failed reading: " << path.value();
94 } 94 }
95 return resize_corner_data; 95 return resize_corner_data;
96 } 96 }
97 } 97 }
98 98
99 return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale( 99 return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
100 resource_id, scale_factor); 100 resource_id, scale_factor);
101 } 101 }
OLDNEW
« no previous file with comments | « webkit/renderer/media/webmediaplayer_ms.h ('k') | webkit/support/test_shell_webblobregistry_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698