Upstream (most of) ios/web/public

ios/web/public/favicon_url.h

Index: ios/web/public/favicon_url.h
diff --git a/content/public/common/favicon_url.h b/ios/web/public/favicon_url.h
similarity index 69%
copy from content/public/common/favicon_url.h
copy to ios/web/public/favicon_url.h
index 43770c2b86b63728dfb0d6d65d6e7c345076e73b..762ce852242d8f1790e753105232ff342c970ac1 100644
--- a/content/public/common/favicon_url.h
+++ b/ios/web/public/favicon_url.h
@@ -1,20 +1,19 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2014 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_FAVICON_URL_H_
-#define CONTENT_PUBLIC_COMMON_FAVICON_URL_H_
+#ifndef IOS_WEB_PUBLIC_FAVICON_URL_
+#define IOS_WEB_PUBLIC_FAVICON_URL_
 
 #include <vector>
 
-#include "content/common/content_export.h"
 #include "ui/gfx/geometry/size.h"
 #include "url/gurl.h"
 
-namespace content {
+namespace web {
 
 // The favicon url from the render.
-struct CONTENT_EXPORT FaviconURL {
+struct FaviconURL {
   // The icon type in a page. The definition must be same as
   // favicon_base::IconType.
   enum IconType {
@@ -40,6 +39,6 @@ struct CONTENT_EXPORT FaviconURL {
   std::vector<gfx::Size> icon_sizes;
 };
 
-} // namespace content
+} // namespace web
 
-#endif  // CONTENT_PUBLIC_COMMON_FAVICON_URL_H_
+#endif  // IOS_WEB_PUBLIC_FAVICON_URL_