Clean up most of the ChromeOS headers in non-ChromeOS build

chrome/browser/extensions/api/settings_private/settings_private_event_router.h

Index: chrome/browser/extensions/api/settings_private/settings_private_event_router.h
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_event_router.h b/chrome/browser/extensions/api/settings_private/settings_private_event_router.h
index 4c2f16667435be57c29fba7e99da71b20bd964d2..9b2d897df91d1d09abb3c723e5795a5dded0549b 100644
--- a/chrome/browser/extensions/api/settings_private/settings_private_event_router.h
+++ b/chrome/browser/extensions/api/settings_private/settings_private_event_router.h
@@ -9,12 +9,14 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/extensions/api/settings_private/prefs_util.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "extensions/browser/event_router.h"
 
+// TODO(wychen): should be guarded by #if defined(OS_CHROMEOS)

[tfarina, 2017/05/04 00:22:24]

Is it a large change if you do it right now?

[wychen, 2017/05/04 01:19:27]

Yes. Similar to the case above, the chromeos:: type usage is not guarded by
ifdefs.

[brettw, 2017/05/09 22:55:25]

Ditto with the comment.

For these TODOs, referecing a bug with more information would be helpful.

[wychen, 2017/05/10 00:08:14]

Done.

+#include "chrome/browser/chromeos/settings/cros_settings.h"
+
 namespace content {
 class BrowserContext;
 }