Merge Chromium at r12.0.742.93: Compile fix in url_constants.cc

Part of file was moved to content, added it to the Android/content
directory. I guess we have to think about syncing content if we do
more merges.

Upstream CL:
http://codereview.chromium.org/6874038

Change-Id: I4ac909bbfcf67c4d5db7eac236d6c9027bd3691d

2 files changed, 83 insertions, 0 deletions

diff --git a/android/content/common/url_constants.cc b/android/content/common/url_constants.cc
new file mode 100644
index 0000000..74ce5f4
--- /dev/null
+++ b/android/content/common/url_constants.cc
@@ -0,0 +1,34 @@
+// Copyright (c) 2011 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.
+
+#include "content/common/url_constants.h"
+
+namespace chrome {
+
+const char kAboutScheme[] = "about";
+const char kBlobScheme[] = "blob";
+const char kChromeDevToolsScheme[] = "chrome-devtools";
+const char kChromeInternalScheme[] = "chrome-internal";
+const char kChromeUIScheme[] = "chrome";
+const char kDataScheme[] = "data";
+const char kExtensionScheme[] = "chrome-extension";
+const char kFileScheme[] = "file";
+const char kFileSystemScheme[] = "filesystem";
+const char kFtpScheme[] = "ftp";
+const char kHttpScheme[] = "http";
+const char kHttpsScheme[] = "https";
+const char kJavaScriptScheme[] = "javascript";
+const char kMailToScheme[] = "mailto";
+const char kMetadataScheme[] = "metadata";
+const char kUserScriptScheme[] = "chrome-user-script";
+const char kViewSourceScheme[] = "view-source";
+
+const char kStandardSchemeSeparator[] = "://";
+
+const char kAboutBlankURL[] = "about:blank";
+const char kAboutCrashURL[] = "about:crash";
+
+const char kUnreachableWebDataURL[] = "chrome://chromewebdata/";
+
+}  // namespace chrome
diff --git a/android/content/common/url_constants.h b/android/content/common/url_constants.h
new file mode 100644
index 0000000..86ce54d
--- /dev/null
+++ b/android/content/common/url_constants.h
@@ -0,0 +1,49 @@
+// Copyright (c) 2011 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.
+
+// Contains constants for known URLs and portions thereof.
+
+#ifndef CONTENT_COMMON_URL_CONSTANTS_H_
+#define CONTENT_COMMON_URL_CONSTANTS_H_
+#pragma once
+
+#include "content/common/url_constants.h"
+
+namespace chrome {
+
+// Canonical schemes you can use as input to GURL.SchemeIs().
+// TODO(jam): some of these don't below in the content layer, but are accessed
+// from there.
+extern const char kAboutScheme[];
+extern const char kBlobScheme[];
+extern const char kChromeDevToolsScheme[];
+extern const char kChromeInternalScheme[];
+extern const char kChromeUIScheme[];  // The scheme used for WebUIs.
+extern const char kCrosScheme[];      // The scheme used for ChromeOS.
+extern const char kDataScheme[];
+extern const char kExtensionScheme[];
+extern const char kFileScheme[];
+extern const char kFileSystemScheme[];
+extern const char kFtpScheme[];
+extern const char kHttpScheme[];
+extern const char kHttpsScheme[];
+extern const char kJavaScriptScheme[];
+extern const char kMailToScheme[];
+extern const char kMetadataScheme[];
+extern const char kUserScriptScheme[];
+extern const char kViewSourceScheme[];
+
+// Used to separate a standard scheme and the hostname: "://".
+extern const char kStandardSchemeSeparator[];
+
+// About URLs (including schemes).
+extern const char kAboutBlankURL[];
+extern const char kAboutCrashURL[];
+
+// Special URL used to start a navigation to an error page.
+extern const char kUnreachableWebDataURL[];
+
+}  // namespace chrome
+
+#endif  // CONTENT_COMMON_URL_CONSTANTS_H_