Only Register() platform specific content settings types on different platforms

components/content_settings/core/browser/website_settings_registry.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 COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_WEBSITE_SETTINGS_REGISTRY_H_
 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_WEBSITE_SETTINGS_REGISTRY_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 22 matching lines @@
   static WebsiteSettingsRegistry* GetInstance();
 
   // Reset the instance for use inside tests.
   void ResetForTest();
 
   const WebsiteSettingsInfo* Get(ContentSettingsType type) const;
   const WebsiteSettingsInfo* GetByName(const std::string& name) const;
 
   // Register a new website setting. This maps an origin to an arbitrary
   // base::Value. Returns a pointer to the registered WebsiteSettingsInfo which
   // is owned by the registry.

[raymes, 2016/05/25 03:36:07]

I think we should add a comment which says that a nullptr will be returned if
registration fails (for example if |platforms| doesn't match the current
platform).

[lshang, 2016/05/25 10:38:16]

Done.

   const WebsiteSettingsInfo* Register(
       ContentSettingsType type,
       const std::string& name,
       std::unique_ptr<base::Value> initial_default_value,
       WebsiteSettingsInfo::SyncStatus sync_status,
       WebsiteSettingsInfo::LossyStatus lossy_status,
       WebsiteSettingsInfo::ScopingType scoping_type,
+      uint32_t platform,

[raymes, 2016/05/25 03:36:07]

nit: platforms

[lshang, 2016/05/25 10:38:16]

Done.

       WebsiteSettingsInfo::IncognitoBehavior incognito_behavior);
 
   const_iterator begin() const;
   const_iterator end() const;
 
  private:
   friend class ContentSettingsRegistryTest;
   friend class WebsiteSettingsRegistryTest;
   friend struct base::DefaultLazyInstanceTraits<WebsiteSettingsRegistry>;
 
   WebsiteSettingsRegistry();
   ~WebsiteSettingsRegistry();
 
   void Init();
 
   Map website_settings_info_;
 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsRegistry);
 };
 
 }  // namespace content_settings
 
 #endif  // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_WEBSITE_SETTINGS_REGISTRY_H_