Upstreaming AndroidProtocolAdapter.

content/public/common/url_constants.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_PUBLIC_COMMON_URL_CONSTANTS_H_
 #define CONTENT_PUBLIC_COMMON_URL_CONSTANTS_H_
 
 #include "content/common/content_export.h"
 
 // Contains constants for known URLs and portions thereof.
@@ skipping 45 matching lines @@
 }  // namespace chrome
 
 namespace content {
 
 // Used to separate a standard scheme and the hostname: "://".
 CONTENT_EXPORT extern const char kStandardSchemeSeparator[];
 
 // Special URL used to start a navigation to an error page.
 CONTENT_EXPORT extern const char kUnreachableWebDataURL[];
 
+// Below are only used for Android.
+extern const char kContentScheme[];
+extern const char kGeoScheme[];
+extern const char kTelScheme[];

[Sami, 2012/07/26 15:12:32]

Geo and Tel aren't part of content URLs so they should probably be upstreamed
separately.

[felipeg, 2012/07/26 15:37:43]

Done.

[mkosiba (inactive), 2012/07/26 16:01:04]

These are leftovers from an old URL intercepting implementation (which had geo
and tel whitelisted) and should be removed from downstream code.

[felipeg, 2012/07/26 16:28:50]

I will update the downstream code in a new CL.
See that I removed those from upstream.

+// Special Android file paths.
+extern const char kAndroidAssetPath[];
+extern const char kAndroidResourcePath[];
+
 // Special URL used to swap out a view being rendered by another process.
 extern const char kSwappedOutURL[];
 
 // Null terminated list of schemes that are savable. This function can be
 // invoked on any thread.
 CONTENT_EXPORT const char* const* GetSavableSchemes();
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_URL_CONSTANTS_H_