1 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/plugins/plugin_prefs.h b/chrome/browser/plugins/plugin_prefs.h
index ebaf5a7..d3b3451 100644
--- a/chrome/browser/plugins/plugin_prefs.h
+++ b/chrome/browser/plugins/plugin_prefs.h
@@ -104,14 +104,14 @@ class PluginPrefs : public RefcountedBrowserContextKeyedService {
 
   // Called to update one of the policy_xyz patterns below when a
   // preference changes.
-  void UpdatePatternsAndNotify(std::set<string16>* patterns,
+  void UpdatePatternsAndNotify(std::set<base::string16>* patterns,
                                const std::string& pref_name);
 
   // Allows unit tests to directly set enforced plug-in patterns.
   void SetPolicyEnforcedPluginPatterns(
-      const std::set<string16>& disabled_patterns,
-      const std::set<string16>& disabled_exception_patterns,
-      const std::set<string16>& enabled_patterns);
+      const std::set<base::string16>& disabled_patterns,
+      const std::set<base::string16>& disabled_exception_patterns,
+      const std::set<base::string16>& enabled_patterns);
 
   // Callback for after the plugin groups have been loaded.
   void EnablePluginGroupInternal(
@@ -132,21 +132,21 @@ class PluginPrefs : public RefcountedBrowserContextKeyedService {
   void NotifyPluginStatusChanged();
 
   static void ListValueToStringSet(const base::ListValue* src,
-                                   std::set<string16>* dest);
+                                   std::set<base::string16>* dest);
 
   // Checks if |name| matches any of the patterns in |pattern_set|.
   static bool IsStringMatchedInSet(const base::string16& name,
-                                   const std::set<string16>& pattern_set);
+                                   const std::set<base::string16>& pattern_set);
 
   // Guards access to the following data structures.
   mutable base::Lock lock_;
 
   PluginState plugin_state_;
-  std::map<string16, bool> plugin_group_state_;
+  std::map<base::string16, bool> plugin_group_state_;
 
-  std::set<string16> policy_disabled_plugin_patterns_;
-  std::set<string16> policy_disabled_plugin_exception_patterns_;
-  std::set<string16> policy_enabled_plugin_patterns_;
+  std::set<base::string16> policy_disabled_plugin_patterns_;
+  std::set<base::string16> policy_disabled_plugin_exception_patterns_;
+  std::set<base::string16> policy_enabled_plugin_patterns_;
 
   // Weak pointer, owns us. Only used as a notification source.
   Profile* profile_;