| Index: chrome/installer/util/master_preferences.h
|
| diff --git a/chrome/installer/util/master_preferences.h b/chrome/installer/util/master_preferences.h
|
| index b068b462fd113dc66ac98cd75d53207d4f231661..83f115002590d73f0ab90aa75e414dec1cf2a9b0 100644
|
| --- a/chrome/installer/util/master_preferences.h
|
| +++ b/chrome/installer/util/master_preferences.h
|
| @@ -85,7 +85,7 @@ class MasterPreferences {
|
| // is present in the command line.
|
| // The options from the preference file and command line are merged, with the
|
| // ones from the command line taking precedence in case of a conflict.
|
| - explicit MasterPreferences(const CommandLine& cmd_line);
|
| + explicit MasterPreferences(const base::CommandLine& cmd_line);
|
|
|
| // Parses a specific preferences file and does not merge any command line
|
| // switches with the distribution dictionary.
|
| @@ -191,7 +191,7 @@ class MasterPreferences {
|
| static const MasterPreferences& ForCurrentProcess();
|
|
|
| protected:
|
| - void InitializeFromCommandLine(const CommandLine& cmd_line);
|
| + void InitializeFromCommandLine(const base::CommandLine& cmd_line);
|
|
|
| // Initializes the instance from a given JSON string, returning true if the
|
| // string was successfully parsed.
|
|
|