| Index: chrome/common/extensions/features/feature_channel.h
|
| diff --git a/chrome/common/extensions/features/feature_channel.h b/chrome/common/extensions/features/feature_channel.h
|
| index dd69f33d3442cc5e61e9893724bdcdf04d103273..88263a13c9287782cd617e63a5975c882908b8bd 100644
|
| --- a/chrome/common/extensions/features/feature_channel.h
|
| +++ b/chrome/common/extensions/features/feature_channel.h
|
| @@ -10,24 +10,24 @@
|
| namespace extensions {
|
|
|
| // Gets the current channel as seen by the Feature system.
|
| -chrome::VersionInfo::Channel GetCurrentChannel();
|
| +version_info::Channel GetCurrentChannel();
|
|
|
| // Sets the current channel as seen by the Feature system. In the browser
|
| // process this should be chrome::VersionInfo::GetChannel(), and in the
|
| // renderer this will need to come from an IPC.
|
| -void SetCurrentChannel(chrome::VersionInfo::Channel channel);
|
| +void SetCurrentChannel(version_info::Channel channel);
|
|
|
| // Gets the default channel as seen by the Feature system.
|
| -chrome::VersionInfo::Channel GetDefaultChannel();
|
| +version_info::Channel GetDefaultChannel();
|
|
|
| // Scoped channel setter. Use for tests.
|
| class ScopedCurrentChannel {
|
| public:
|
| - explicit ScopedCurrentChannel(chrome::VersionInfo::Channel channel);
|
| + explicit ScopedCurrentChannel(version_info::Channel channel);
|
| ~ScopedCurrentChannel();
|
|
|
| private:
|
| - chrome::VersionInfo::Channel original_channel_;
|
| + version_info::Channel original_channel_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ScopedCurrentChannel);
|
| };
|
|
|