ScreenCapture for Android phase1, part II

components/content_settings/core/browser/content_settings_registry_unittest.cc

 // 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.
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "components/content_settings/core/browser/content_settings_info.h"
@@ skipping 34 matching lines @@
 
 // Protected media identifier only get registered on android and chromeos.
 #if defined(ANDROID) || defined(OS_CHROMEOS)
   EXPECT_TRUE(
       registry()->Get(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER));
 #else
   EXPECT_FALSE(
       registry()->Get(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER));
 #endif
 
+#if defined(OS_ANDROID)
+  // Media stream screen only gets registered on android.
+  EXPECT_TRUE(registry()->Get(CONTENT_SETTINGS_TYPE_MEDIASTREAM_SCREEN));
+#endif

[raymes, 2016/07/13 02:44:09]

nit: this should have an #else too (as above)

[braveyao, 2016/07/13 19:51:57]

Done.

+
   // Cookies is registered on all platforms.
   EXPECT_TRUE(registry()->Get(CONTENT_SETTINGS_TYPE_COOKIES));
 }
 
 TEST_F(ContentSettingsRegistryTest, Properties) {
   // The cookies type should be registered.
   const ContentSettingsInfo* info =
       registry()->Get(CONTENT_SETTINGS_TYPE_COOKIES);
   ASSERT_TRUE(info);
 
@@ skipping 53 matching lines @@
 #if defined(OS_ANDROID) || defined(OS_IOS)
   EXPECT_FALSE(plugins_found);
 #else
   EXPECT_TRUE(plugins_found);
 #endif
 
   EXPECT_TRUE(cookies_found);
 }
 
 }  // namespace content_settings