Unregister Images, Plugins and Mouselock content settings on android

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 20 matching lines @@
   WebsiteSettingsRegistry website_settings_registry_;
   ContentSettingsRegistry registry_;
 };
 
 TEST_F(ContentSettingsRegistryTest, GetPlatformDependent) {
 #if defined(OS_IOS)
   // Javascript shouldn't be registered on iOS.
   EXPECT_FALSE(registry()->Get(CONTENT_SETTINGS_TYPE_JAVASCRIPT));
 #endif
 
+#if defined(OS_IOS) || defined(OS_ANDROID)
+  // Images shouldn't be registered on mobile.
+  EXPECT_FALSE(registry()->Get(CONTENT_SETTINGS_TYPE_IMAGES));
+#endif
+
 // Protected media identifier only get registered on android and chromeos.
-#if defined(ANDROID) | defined(OS_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
 
   // Cookies is registered on all platforms.
   EXPECT_TRUE(registry()->Get(CONTENT_SETTINGS_TYPE_COOKIES));
 }
@@ skipping 50 matching lines @@
     EXPECT_EQ(registry()->Get(type), info);
     if (type == CONTENT_SETTINGS_TYPE_PLUGINS) {
       EXPECT_FALSE(plugins_found);
       plugins_found = true;
     } else if (type == CONTENT_SETTINGS_TYPE_COOKIES) {
       EXPECT_FALSE(cookies_found);
       cookies_found = true;
     }
   }
 
-#if defined(OS_IOS)
+#if defined(OS_ANDROID) || defined(OS_IOS)
   EXPECT_FALSE(plugins_found);
 #else
   EXPECT_TRUE(plugins_found);
 #endif
 
   EXPECT_TRUE(cookies_found);
 }
 
 }  // namespace content_settings