Use primary/secondary for URLs and patterns everywhere in the content settings extension API.

chrome/browser/extensions/extension_content_settings_store.h

 // Copyright (c) 2011 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 CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTENT_SETTINGS_STORE_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTENT_SETTINGS_STORE_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 100 matching lines @@
 
   // Adds |observer|. This method should only be called on the UI thread.
   void AddObserver(Observer* observer);
 
   // Remove |observer|. This method should only be called on the UI thread.
   void RemoveObserver(Observer* observer);
 
  private:
   struct ExtensionEntry;
   struct ContentSettingSpec {
-    ContentSettingSpec(const ContentSettingsPattern& pattern,
-                       const ContentSettingsPattern& embedder_pattern,
+    ContentSettingSpec(const ContentSettingsPattern& primary_pattern,
+                       const ContentSettingsPattern& secondary_pattern,
                        ContentSettingsType type,
                        const content_settings::ResourceIdentifier& identifier,
                        ContentSetting setting);
 
-    ContentSettingsPattern embedded_pattern;
-    ContentSettingsPattern top_level_pattern;
+    ContentSettingsPattern primary_pattern;
+    ContentSettingsPattern secondary_pattern;
     ContentSettingsType content_type;
     content_settings::ResourceIdentifier resource_identifier;
     ContentSetting setting;
   };
 
   typedef std::map<std::string, ExtensionEntry*> ExtensionEntryMap;
 
   typedef std::list<ContentSettingSpec> ContentSettingSpecList;
 
   ContentSetting GetContentSettingFromSpecList(
@@ skipping 28 matching lines @@
   ExtensionEntryMap entries_;
 
   ObserverList<Observer, false> observers_;
 
   mutable base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionContentSettingsStore);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTENT_SETTINGS_STORE_H_