Upstream (most of) ios/web/public

ios/web/public/favicon_url.cc

Index: ios/web/public/favicon_url.cc
diff --git a/content/public/common/favicon_url.cc b/ios/web/public/favicon_url.cc
similarity index 71%
copy from content/public/common/favicon_url.cc
copy to ios/web/public/favicon_url.cc
index 68ba481b531178388feef27c198073f1555dce8a..53f1573337edaaf0446405733a50bf4eec47af0e 100644
--- a/content/public/common/favicon_url.cc
+++ b/ios/web/public/favicon_url.cc
@@ -1,10 +1,10 @@
-// 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.
 
-#include "content/public/common/favicon_url.h"
+#include "ios/web/public/favicon_url.h"
 
-namespace content {
+namespace web {
 
 FaviconURL::FaviconURL()
   : icon_type(INVALID_ICON) {
@@ -18,4 +18,4 @@ FaviconURL::FaviconURL(const GURL& url,
 FaviconURL::~FaviconURL() {
 }
 
-} // namespace content
+} // namespace web