The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/4122753620f4aa139b0606912a00491733a59b65

commit 4122753620f4aa139b0606912a00491733a59b65
Author: rdevlin.cronin <rdevlin.cronin@chromium.org>
Date: Wed Jul 13 21:24:34 2016

[Extensions] Move Feature channel code into //extensions

Channel code used to be in //chrome, so it couldn't be used in
//extensions.  Now that it's moved to components/, we can safely
include it and can simplify Features code significantly.

BUG= 626774 

Review-Url: https://codereview.chromium.org/2137463003
Cr-Commit-Position: refs/heads/master@{#405285}

[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/chromeos/login/saml/saml_browsertest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/extensions/active_tab_unittest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/extensions/api/declarative_content/set_icon_apitest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/extensions/api/idltest/idltest_apitest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/extensions/chrome_extensions_browser_client.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/extensions/chrome_notification_observer.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/extensions/error_console/error_console.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/extensions/error_console/error_console_unittest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/extensions/extension_browsertest.h
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/extensions/extension_service.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/extensions/extension_system_impl.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/extensions/shared_module_service_unittest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/policy/policy_browsertest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/supervised_user/supervised_user_service_unittest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/ui/apps/chrome_app_window_client.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/chrome_common.gypi
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/chrome_tests_unit.gypi
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/common/extensions/api/commands/commands_manifest_unittest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/common/extensions/api/storage/storage_schema_manifest_handler_unittest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/common/extensions/chrome_extensions_client.cc
[delete] https://crrev.com/92e2691c3adb201ba8889d6050ed34cbce8184bf/chrome/common/extensions/features/chrome_channel_feature_filter.cc
[delete] https://crrev.com/92e2691c3adb201ba8889d6050ed34cbce8184bf/chrome/common/extensions/features/chrome_channel_feature_filter.h
[delete] https://crrev.com/92e2691c3adb201ba8889d6050ed34cbce8184bf/chrome/common/extensions/features/chrome_channel_feature_filter_unittest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/common/extensions/features/feature_util.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/common/extensions/manifest_handlers/automation_unittest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/common/extensions/manifest_handlers/ui_overrides_handler_unittest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/common/extensions/manifest_tests/chrome_manifest_test.h
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/common/extensions/permissions/permission_set_unittest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/common/extensions/permissions/settings_override_permission_unittest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/common/pepper_permission_util_unittest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/extensions/DEPS
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/extensions/browser/api/app_window/app_window_apitest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/extensions/common/features/complex_feature.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/extensions/common/features/complex_feature.h
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/extensions/common/features/feature.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/extensions/common/features/feature.h
[rename] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/extensions/common/features/feature_channel.cc
[rename] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/extensions/common/features/feature_channel.h
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/extensions/common/features/simple_feature.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/extensions/common/features/simple_feature.h
[delete] https://crrev.com/92e2691c3adb201ba8889d6050ed34cbce8184bf/extensions/common/features/simple_feature_filter.cc
[delete] https://crrev.com/92e2691c3adb201ba8889d6050ed34cbce8184bf/extensions/common/features/simple_feature_filter.h
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/extensions/common/features/simple_feature_unittest.cc
[modify] https://crrev.com/4122753620f4aa139b0606912a00491733a59b65/extensions/extensions.gypi

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/ea63fff365730c62da696327aef771d74d01c78a

commit ea63fff365730c62da696327aef771d74d01c78a
Author: rdevlin.cronin <rdevlin.cronin@chromium.org>
Date: Mon Jul 18 15:49:35 2016

[Extensions] Clean up renderer channel-related code

version_info::Channel is a component, so we can include it in
//extensions and clean up a bunch of messy back-and-forth with //chrome.

BUG= 626774 
TBR=jam@chromium.org (chrome_content_client include path change)

Review-Url: https://codereview.chromium.org/2141703003
Cr-Commit-Position: refs/heads/master@{#406003}

[modify] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/chrome/browser/extensions/chrome_extensions_browser_client.h
[delete] https://crrev.com/7a44b9eb2df493236df608d21681b563dbd74539/chrome/browser/extensions/chrome_notification_observer.cc
[delete] https://crrev.com/7a44b9eb2df493236df608d21681b563dbd74539/chrome/browser/extensions/chrome_notification_observer.h
[modify] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/chrome/chrome_browser_extensions.gypi
[modify] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/chrome/chrome_common.gypi
[modify] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/chrome/common/chrome_content_client.cc
[modify] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/chrome/common/extensions/chrome_extensions_client.cc
[delete] https://crrev.com/7a44b9eb2df493236df608d21681b563dbd74539/chrome/common/extensions/features/feature_util.h
[modify] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc
[modify] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h
[modify] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/extensions/browser/renderer_startup_helper.cc
[modify] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/extensions/common/extension_messages.h
[rename] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/extensions/common/features/feature_util.cc
[modify] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/extensions/common/features/feature_util.h
[modify] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/extensions/common/features/simple_feature.cc
[modify] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/extensions/common/features/simple_feature_unittest.cc
[modify] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/extensions/extensions.gypi
[modify] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/extensions/renderer/dispatcher.cc
[modify] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/extensions/renderer/dispatcher.h
[modify] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/extensions/renderer/dispatcher_delegate.h
[modify] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/extensions/shell/test/shell_test.cc
[modify] https://crrev.com/ea63fff365730c62da696327aef771d74d01c78a/extensions/shell/test/shell_test.h