| Index: chrome/common/extensions/extension_switch_utils.h | 
| diff --git a/chrome/common/extensions/extension_switch_utils.h b/chrome/common/extensions/extension_switch_utils.h | 
| index e2c53ca167eea5adcfe5373e900a85c79a198003..4965dc0111aafdd437eaf16aad0ce16e43502b6f 100644 | 
| --- a/chrome/common/extensions/extension_switch_utils.h | 
| +++ b/chrome/common/extensions/extension_switch_utils.h | 
| @@ -14,6 +14,20 @@ bool IsEasyOffStoreInstallEnabled(); | 
|  | 
| bool IsActionBoxEnabled(); | 
|  | 
| +// TODO(jyasskin): Convert this to a generic switch system that wraps the whole | 
| +// interaction with CommandLine::HasSwitch and doesn't require globals. | 
| +enum EnabledState { | 
| +  ENABLED, | 
| +  DISABLED | 
| +}; | 
| + | 
| +// Using this makes all other access to IsActionBoxEnabled NOT thread-safe. | 
| +class ScopedSetActionBoxForTest { | 
| + public: | 
| +  explicit ScopedSetActionBoxForTest(EnabledState); | 
| +  ~ScopedSetActionBoxForTest(); | 
| +}; | 
| + | 
| }  // switch_utils | 
|  | 
| }  // extensions | 
|  |