Fix build when ENABLE_MANAGED_USERS isn't defined
commitc6e24e396d431af23074ba590acb99d289118c8d
authormckev@amazon.com <mckev@amazon.com@0039d316-1c4b-4281-b951-d872f2087c98>
Thu, 27 Mar 2014 17:39:07 +0000 (27 17:39 +0000)
committermckev@amazon.com <mckev@amazon.com@0039d316-1c4b-4281-b951-d872f2087c98>
Thu, 27 Mar 2014 17:39:07 +0000 (27 17:39 +0000)
treeaabe1bd730d03d380a9e98af925754f2716337fc
parent7c1c98ed921a68cf48bea0bf45d2c85fcf3007e7
Fix build when ENABLE_MANAGED_USERS isn't defined

In https://codereview.chromium.org/137753012/, (and its associated reverts)
ManagedUserSigninManagerWrapper is added to create a bridge between managed
users and normally authenticated users.  Unfortunately, in builds where
enable_managed_users==0 in gyp, the wrapper is excluded from the build due
to an exclusion list in chrome_browser.gypi.

Therefore, when enable_managed_users==0, libchromeshell fails to build
(as well as any other projects that pull in chrome.gyp:chrome).

1) This moves ManagedUserSigninManagerWrapper to chrome/browser/sync because
it is the only place this wrapper is used.  This also prevents the class from
being conditionally excluded due to the rules in chrome_browser.gypi.

2) This commit also adds a missing #ifdef in tab_helpers.cc, which resulted
in a compilation error (unused variable 'profile') if ENABLE_MANAGED_USERS is
not defined.

BUG=352733

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259928 0039d316-1c4b-4281-b951-d872f2087c98
12 files changed:
chrome/browser/sync/managed_user_signin_manager_wrapper.cc [moved from chrome/browser/managed_mode/managed_user_signin_manager_wrapper.cc with 94% similarity]
chrome/browser/sync/managed_user_signin_manager_wrapper.h [moved from chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h with 82% similarity]
chrome/browser/sync/profile_sync_service.cc
chrome/browser/sync/profile_sync_service_factory.cc
chrome/browser/sync/profile_sync_service_mock.cc
chrome/browser/sync/profile_sync_service_startup_unittest.cc
chrome/browser/sync/profile_sync_service_unittest.cc
chrome/browser/sync/startup_controller.cc
chrome/browser/sync/startup_controller_unittest.cc
chrome/browser/sync/test_profile_sync_service.cc
chrome/browser/ui/tab_helpers.cc
chrome/chrome_browser.gypi