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

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

 // Copyright 2015 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_SETTINGS_PRIVATE_EVENT_ROUTER_H_
 #define CHROME_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_SETTINGS_PRIVATE_EVENT_ROUTER_H_
 
 #include <memory>
 
 #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;
 }
 
 namespace extensions {
 
 // This is an event router that will observe listeners to pref changes on the
 // appropriate pref service(s) and notify listeners on the JavaScript
 // settingsPrivate API.
 class SettingsPrivateEventRouter : public KeyedService,
@@ skipping 44 matching lines @@
   std::unique_ptr<PrefsUtil> prefs_util_;
 
   base::WeakPtrFactory<SettingsPrivateEventRouter> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SettingsPrivateEventRouter);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_SETTINGS_PRIVATE_EVENT_ROUTER_H_