ChromeOS default switches cleanup - switches::kEnableThreadedCompositing and switches::kEnableSmoothScrolling should not be an option on ChromeOS anymore.

BUG=170948
TEST=existing tests


Review URL: https://chromiumcodereview.appspot.com/11938025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177859 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index bd05e5b..6191595 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -327,7 +327,7 @@
     "threaded-compositing-mode",
     IDS_FLAGS_THREADED_COMPOSITING_MODE_NAME,
     IDS_FLAGS_THREADED_COMPOSITING_MODE_DESCRIPTION,
-    kOsAll,
+    kOsAll & ~kOsCrOS,
     MULTI_VALUE_TYPE(kThreadedCompositingModeChoices)
   },
   {
@@ -562,7 +562,7 @@
     IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_DESCRIPTION,
     // Can't expose the switch unless the code is compiled in.
     // On by default for the Mac (different implementation in WebKit).
-    kOsWin | kOsLinux | kOsCrOS,
+    kOsWin | kOsLinux,
     SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling)
   },
   {