diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-12 12:13:00 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-12 12:13:00 +0000 |
| commit | c7b8942c578f4b1ae755e698e3113739e3b27de4 (patch) | |
| tree | 13b9fbef381591c7debdb9b8f420ed883100d702 | |
| parent | 122dbbe80efb561737a27c8ac574976b4ce535ae (diff) | |
| download | chromium_src-c7b8942c578f4b1ae755e698e3113739e3b27de4.zip chromium_src-c7b8942c578f4b1ae755e698e3113739e3b27de4.tar.gz chromium_src-c7b8942c578f4b1ae755e698e3113739e3b27de4.tar.bz2 | |
Merge 261734 "Fix unit test failure on official bots."
> Fix unit test failure on official bots.
>
> The API this test is exercising has not been release on all channels.
>
> BUG=359794
> R=battre@chromium.org
>
> Review URL: https://codereview.chromium.org/225883002
TBR=finnur@chromium.org
Review URL: https://codereview.chromium.org/227433020
git-svn-id: svn://svn.chromium.org/chrome/branches/1916/src@263519 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_message_bubble_controller_unittest.cc | 6 | ||||
| -rw-r--r-- | chrome/common/extensions/api/_manifest_features.json | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc index f84e31a..3f2c5dd 100644 --- a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc +++ b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc @@ -12,6 +12,7 @@ #include "chrome/browser/extensions/settings_api_bubble_controller.h" #include "chrome/browser/extensions/suspicious_extension_bubble_controller.h" #include "chrome/browser/extensions/test_extension_system.h" +#include "chrome/common/chrome_version_info.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread_bundle.h" #include "extensions/common/extension.h" @@ -465,6 +466,11 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_DevModeControllerTest) { #endif TEST_F(ExtensionMessageBubbleTest, MAYBE_SettingsApiControllerTest) { + // The API this test is exercising has not been release on all channels. + // TODO(finnur): Remove the if check once it is released. + if (chrome::VersionInfo::GetChannel() > chrome::VersionInfo::CHANNEL_DEV) + return; + Init(); extensions::ExtensionPrefs* prefs = extensions::ExtensionPrefs::Get(profile()); diff --git a/chrome/common/extensions/api/_manifest_features.json b/chrome/common/extensions/api/_manifest_features.json index 670bed0..35cfcc6 100644 --- a/chrome/common/extensions/api/_manifest_features.json +++ b/chrome/common/extensions/api/_manifest_features.json @@ -79,6 +79,8 @@ "channel": "stable", "extension_types": ["extension"] }, + // TODO(finnur): Remove channel check for SettingsApiControllerTest when this + // goes to stable. "chrome_settings_overrides": [{ "channel": "dev", "extension_types": ["extension"], |