Change ContentSettingsType's scoping type and hookup migration code

components/content_settings/core/browser/website_settings_info.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_INFO_H_
 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_WEBSITE_SETTINGS_INFO_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 
 namespace base {
 class Value;
 }  // namespace base
 
 namespace content_settings {
 
 // This class stores the properties related to a website setting.
 class WebsiteSettingsInfo {
  public:
   enum SyncStatus { SYNCABLE, UNSYNCABLE };
 
   enum LossyStatus { LOSSY, NOT_LOSSY };
 
   enum ScopingType {
-    // Settings scoped to the domain of the main frame only.
-    TOP_LEVEL_DOMAIN_ONLY_SCOPE,
-
-    // Settings scoped to the domain of the requesting frame only. This should
-    // not generally be used.
-    REQUESTING_DOMAIN_ONLY_SCOPE,
+    // Settings scoped to the origin of the main frame only.
+    TOP_LEVEL_ORIGIN_ONLY_SCOPE,
 
     // Settings scoped to the origin of the requesting frame only.
     REQUESTING_ORIGIN_ONLY_SCOPE,
 
     // Settings scoped to the combination of the origin of the requesting
     // frame and the origin of the top level frame.
     REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE
   };
 
   enum IncognitoBehavior {
@@ skipping 40 matching lines @@
   const LossyStatus lossy_status_;
   const ScopingType scoping_type_;
   const IncognitoBehavior incognito_behavior_;
 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsInfo);
 };
 
 }  // namespace content_settings
 
 #endif  // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_WEBSITE_SETTINGS_INFO_H_