| Index: chrome_frame/registry_list_preferences_holder.h
|
| diff --git a/chrome_frame/registry_list_preferences_holder.h b/chrome_frame/registry_list_preferences_holder.h
|
| index c57c462c00cb0e85459e9d01c6b5d4c2dc3e77b4..ec054c276f39a3d29125420d6383fe5c1f6f79c9 100644
|
| --- a/chrome_frame/registry_list_preferences_holder.h
|
| +++ b/chrome_frame/registry_list_preferences_holder.h
|
| @@ -30,10 +30,10 @@ class RegistryListPreferencesHolder {
|
|
|
| // Returns true iff |string| matches any of the strings in values_, using the
|
| // matching logic in base's MatchPattern().
|
| - bool ListMatches(const string16& string) const;
|
| + bool ListMatches(const base::string16& string) const;
|
|
|
| // Manually add a string to values_ for testing purposes.
|
| - void AddStringForTesting(const string16& string);
|
| + void AddStringForTesting(const base::string16& string);
|
|
|
| // Reset the holder causing it to be re-initialized, for testing purposes
|
| // only.
|
| @@ -41,7 +41,7 @@ class RegistryListPreferencesHolder {
|
| void ResetForTesting();
|
|
|
| private:
|
| - std::vector<string16> values_;
|
| + std::vector<base::string16> values_;
|
| bool valid_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RegistryListPreferencesHolder);
|
|
|