Index: chrome/browser/extensions/active_tab_unittest.cc |
diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc |
index 8d89be6effcd11b81fa9efa80ff55f2334252a7d..1cee2f9c5d1a8e013ed32205dfdc1cc58606fd5f 100644 |
--- a/chrome/browser/extensions/active_tab_unittest.cc |
+++ b/chrome/browser/extensions/active_tab_unittest.cc |
@@ -55,11 +55,11 @@ scoped_refptr<const Extension> CreateTestExtension( |
class ActiveTabTest : public TabContentsTestHarness { |
public: |
ActiveTabTest() |
- : extension(CreateTestExtension("deadbeef", true)), |
+ : current_channel_(chrome::VersionInfo::CHANNEL_DEV), |
+ extension(CreateTestExtension("deadbeef", true)), |
another_extension(CreateTestExtension("feedbeef", true)), |
extension_without_active_tab(CreateTestExtension("badbeef", false)), |
- ui_thread_(BrowserThread::UI, MessageLoop::current()), |
- current_channel_(chrome::VersionInfo::CHANNEL_DEV) {} |
+ ui_thread_(BrowserThread::UI, MessageLoop::current()) {} |
protected: |
int tab_id() { |
@@ -106,6 +106,11 @@ class ActiveTabTest : public TabContentsTestHarness { |
return extension->HasAPIPermissionForTab(tab_id, APIPermission::kTab); |
} |
+ // Force the test to run in dev channel because the permission is only |
+ // available in dev channel. Without declaring this first, the extensions |
+ // below won't load due to manifest errors. |
+ Feature::ScopedCurrentChannel current_channel_; |
+ |
// An extension with the activeTab permission. |
scoped_refptr<const Extension> extension; |
@@ -117,7 +122,6 @@ class ActiveTabTest : public TabContentsTestHarness { |
private: |
content::TestBrowserThread ui_thread_; |
- Feature::ScopedCurrentChannel current_channel_; |
}; |
TEST_F(ActiveTabTest, GrantToSinglePage) { |