| Index: chrome/browser/chromeos/settings/owner_flags_storage.cc
|
| diff --git a/chrome/browser/chromeos/settings/owner_flags_storage.cc b/chrome/browser/chromeos/settings/owner_flags_storage.cc
|
| index a2312648e1968d9ae68697cfdadfb4f66f261431..b0d097d9d6260d462dc7b95d359b1f64ae2c6e85 100644
|
| --- a/chrome/browser/chromeos/settings/owner_flags_storage.cc
|
| +++ b/chrome/browser/chromeos/settings/owner_flags_storage.cc
|
| @@ -20,7 +20,7 @@ namespace about_flags {
|
| OwnerFlagsStorage::OwnerFlagsStorage(
|
| PrefService* prefs,
|
| ownership::OwnerSettingsService* owner_settings_service)
|
| - : ::flags_ui::PrefServiceFlagsStorage(prefs),
|
| + : flags_ui::PrefServiceFlagsStorage(prefs),
|
| owner_settings_service_(owner_settings_service) {
|
| // Make this code more unit test friendly.
|
| if (g_browser_process->local_state()) {
|
| @@ -57,7 +57,7 @@ bool OwnerFlagsStorage::SetFlags(const std::set<std::string>& flags) {
|
|
|
| base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
|
| ::about_flags::ConvertFlagsToSwitches(this, &command_line,
|
| - ::about_flags::kNoSentinels);
|
| + flags_ui::kNoSentinels);
|
| base::CommandLine::StringVector switches = command_line.argv();
|
| for (base::CommandLine::StringVector::const_iterator it =
|
| switches.begin() + 1;
|
|
|