Refactor SecurityStateModel/Clients for simplicity and reusability.

components/security_state/content/BUILD.gn

-# Copyright 2015 The Chromium Authors. All rights reserved.
+# Copyright 2016 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.
 
 static_library("content") {
   sources = [
-    "content_favicon_driver.cc",
-    "content_favicon_driver.h",
-    "favicon_url_util.cc",
-    "favicon_url_util.h",
+    "content_utils.cc",
+    "content_utils.h",
   ]
 
   public_deps = [
-    "//components/favicon/core",
-    "//ui/gfx",
+    "//components/security_state/core",
   ]
+
   deps = [
     "//base",
-    "//components/favicon_base",
-    "//components/history/core/browser",
+    "//components/strings",
     "//content/public/browser",
     "//content/public/common",
-    "//url",
+    "//net",
+    "//third_party/WebKit/public:blink_headers",
+    "//ui/base",
   ]
 }
 
 source_set("unit_tests") {
   testonly = true
   sources = [
-    "content_favicon_driver_unittest.cc",
+    "content_utils_unittest.cc",
   ]
+
   deps = [
     ":content",
-    "//components/favicon/core",
+    "//base",
+    "//base/test:test_support",
+    "//components/security_state/core",
     "//content/public/browser",
-    "//content/public/common",
     "//content/test:test_support",
-    "//skia",
+    "//net",
     "//testing/gtest",
   ]
 }