Cleanup favicon after componentization completion

//chrome/browser/favicon now only hold factories or //chrome specific
helper code and componentization is over. Remove temporary OWNERS rights
for sdefresne@ and remove DEPS exceptions.

BUG=359513

Review URL: https://codereview.chromium.org/1079473003

Cr-Commit-Position: refs/heads/master@{#325017}

5 files changed, 10 insertions, 40 deletions

diff --git a/chrome/browser/favicon/DEPS b/chrome/browser/favicon/DEPS
index 7bc0c6f..bd86119 100644
--- a/chrome/browser/favicon/DEPS
+++ b/chrome/browser/favicon/DEPS
@@ -1,39 +1,14 @@
 include_rules = [
-  # Favicon is being made into a Browser Component, so we have these
-  # three basic rules followed by temporary exceptions.  Please don't
-  # add to the list of exceptions!
-  "-chrome/browser",
-  "+chrome/browser/chrome_notification_types.h",
-  "+chrome/browser/common",
-  "+chrome/browser/favicon",
-
-  # Permanently-allowed DEPS beyond the standard Browser
-  # Components-like DEPS above go here.
-  "+chrome/browser/profiles/incognito_helpers.h",
-  "+chrome/browser/search/search.h",
-  "+components/favicon/core",
-  "+net/base/registry_controlled_domains/registry_controlled_domain.h",
-  "+third_party/skia/include/core/SkBitmap.h",
-
-  # TODO(caitkp): Bring this list to zero.
+  # Favicon is a layered component [1]. You will only find Chrome specific
+  # factories and helper in that directory, the meat of the components is
+  # located at //components/favicon.
   #
-  # Do not add to the list of temporarily-allowed dependencies below,
-  # and please do not introduce more #includes of these files.
-  "!chrome/browser/bookmarks/bookmark_model_factory.h",
-  "!chrome/browser/history/history_backend.h",
-  "!chrome/browser/history/history_service.h",
-  "!chrome/browser/history/history_service_factory.h",
-  "!chrome/browser/history/select_favicon_frames.h",
-  "!chrome/browser/profiles/profile.h",
-  "!chrome/browser/ui/webui/chrome_web_ui_controller_factory.h",
-  "!components/bookmarks/browser/bookmark_model.h",
-  # Do not add to the list of temporarily-allowed dependencies above,
-  # and please do not introduce more #includes of these files.
+  # [1]: http://www.chromium.org/developers/design-documents/layered-components-design
+  "+chrome/browser",
 ]
 
 specific_include_rules = {
-  # Browser tests, by definition, need access to the browser objects.
-  '.*_browsertest\.cc': [
-    "+chrome/browser",
+  '.*test\.cc': [
+    "+chrome/test",
   ]
 }
diff --git a/chrome/browser/favicon/OWNERS b/chrome/browser/favicon/OWNERS
index f061d75..c888e87 100644
--- a/chrome/browser/favicon/OWNERS
+++ b/chrome/browser/favicon/OWNERS
@@ -3,7 +3,4 @@ sky@chromium.org
 stevenjb@chromium.org
 
 # Temporary owner, for refactoring changes only.
-sdefresne@chromium.org
-
-# Temporary owner, for refactoring changes only.
 caitkp@chromium.org
diff --git a/components/OWNERS b/components/OWNERS
index 14c64b0..b69b99a 100644
--- a/components/OWNERS
+++ b/components/OWNERS
@@ -77,10 +77,9 @@ per-file enhanced_bookmarks*=sky@chromium.org
 per-file error_page*=mmenke@chromium.org
 per-file error_page*=ttuttle@chromium.org
 
+per-file favicon*=pkotwicz@chromium.org
 per-file favicon*=sky@chromium.org
 per-file favicon*=stevenjb@chromium.org
-# Temporary for the duration of the favicon componentization.
-per-file favicon*=sdefresne@chromium.org
 
 per-file feedback.gypi=bsimonnet@chromium.org
 per-file feedback.gypi=zork@chromium.org
diff --git a/components/favicon/OWNERS b/components/favicon/OWNERS
index 38c18f8..a5ad75c 100644
--- a/components/favicon/OWNERS
+++ b/components/favicon/OWNERS
@@ -1,5 +1,3 @@
+pkotwicz@chromium.org
 sky@chromium.org
 stevenjb@chromium.org
-
-# Temporary for the duration of the favicon componentization.
-sdefresne@chromium.org
diff --git a/components/favicon/ios/OWNERS b/components/favicon/ios/OWNERS
new file mode 100644
index 0000000..378261e
--- /dev/null
+++ b/components/favicon/ios/OWNERS
@@ -0,0 +1 @@
+sdefresne@chromium.org
\ No newline at end of file