From cbe9043f72995b6c2358c359a575b6219d621c29 Mon Sep 17 00:00:00 2001 From: "finnur@chromium.org" Date: Fri, 4 Apr 2014 13:07:09 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261734 0039d316-1c4b-4281-b951-d872f2087c98 --- .../extensions/extension_message_bubble_controller_unittest.cc | 6 ++++++ chrome/common/extensions/api/_manifest_features.json | 2 ++ 2 files changed, 8 insertions(+) diff --git a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc index f84e31a74cf4..3f2c5dd9b6ed 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 670bed0e2f8b..35cfcc6f29c0 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"], -- 2.11.4.GIT