Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1194)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/extension_message_bubble_controller_unittest.cc

Issue 288923004: Add an extension override bubble and warning box for proxy extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_message_bubble_controller.h ('k') | chrome/browser/extensions/ntp_overridden_bubble_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
diff --git a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
index 6eed0455145d64c8ed51b0a7231b4af14e26868b..01d059acc2e54644f7eaf2466974b15e59a784c0 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
+++ b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
@@ -3,23 +3,31 @@
// found in the LICENSE file.
#include "base/command_line.h"
+#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
+#include "base/values.h"
#include "chrome/browser/extensions/dev_mode_bubble_controller.h"
#include "chrome/browser/extensions/extension_function_test_utils.h"
#include "chrome/browser/extensions/extension_message_bubble.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/ntp_overridden_bubble_controller.h"
+#include "chrome/browser/extensions/proxy_overridden_bubble_controller.h"
#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/common/pref_names.h"
#include "chrome/test/base/testing_profile.h"
#include "content/public/test/test_browser_thread_bundle.h"
+#include "extensions/browser/extension_pref_value_map.h"
+#include "extensions/browser/extension_pref_value_map_factory.h"
#include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_registry.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_builder.h"
#include "extensions/common/feature_switch.h"
+#include "extensions/common/value_builder.h"
namespace {
@@ -159,6 +167,31 @@ class TestNtpOverriddenBubbleController
}
};
+// A test class for the ProxyOverriddenBubbleController.
+class TestProxyOverriddenBubbleController
+ : public ProxyOverriddenBubbleController,
+ public TestDelegate {
+ public:
+ explicit TestProxyOverriddenBubbleController(Profile* profile)
+ : ProxyOverriddenBubbleController(profile) {
+ }
+
+ virtual void OnBubbleAction() OVERRIDE {
+ ++action_button_callback_count_;
+ ProxyOverriddenBubbleController::OnBubbleAction();
+ }
+
+ virtual void OnBubbleDismiss() OVERRIDE {
+ ++dismiss_button_callback_count_;
+ ProxyOverriddenBubbleController::OnBubbleDismiss();
+ }
+
+ virtual void OnLinkClicked() OVERRIDE {
+ ++link_click_callback_count_;
+ ProxyOverriddenBubbleController::OnLinkClicked();
+ }
+};
+
// A fake bubble used for testing the controller. Takes an action that specifies
// what should happen when the bubble is "shown" (the bubble is actually not
// shown, the corresponding action is taken immediately).
@@ -209,84 +242,143 @@ class ExtensionMessageBubbleTest : public testing::Test {
public:
ExtensionMessageBubbleTest() {}
- void LoadGenericExtension(const std::string& index,
- const std::string& id,
- Manifest::Location location) {
- extensions::ExtensionBuilder builder;
- builder.SetManifest(extensions::DictionaryBuilder()
+ testing::AssertionResult LoadGenericExtension(const std::string& index,
+ const std::string& id,
+ Manifest::Location location) {
+ ExtensionBuilder builder;
+ builder.SetManifest(DictionaryBuilder()
.Set("name", std::string("Extension " + index))
.Set("version", "1.0")
.Set("manifest_version", 2));
builder.SetLocation(location);
builder.SetID(id);
service_->AddExtension(builder.Build().get());
+
+ if (ExtensionRegistry::Get(profile())->enabled_extensions().GetByID(id))
+ return testing::AssertionSuccess();
+ return testing::AssertionFailure() << "Could not install extension: " << id;
}
- void LoadExtensionWithAction(const std::string& index,
- const std::string& id,
- Manifest::Location location) {
- extensions::ExtensionBuilder builder;
- builder.SetManifest(extensions::DictionaryBuilder()
+ testing::AssertionResult LoadExtensionWithAction(
+ const std::string& index,
+ const std::string& id,
+ Manifest::Location location) {
+ ExtensionBuilder builder;
+ builder.SetManifest(DictionaryBuilder()
.Set("name", std::string("Extension " + index))
.Set("version", "1.0")
.Set("manifest_version", 2)
.Set("browser_action",
- extensions::DictionaryBuilder().Set(
+ DictionaryBuilder().Set(
"default_title", "Default title")));
builder.SetLocation(location);
builder.SetID(id);
service_->AddExtension(builder.Build().get());
+
+ if (ExtensionRegistry::Get(profile())->enabled_extensions().GetByID(id))
+ return testing::AssertionSuccess();
+ return testing::AssertionFailure() << "Could not install extension: " << id;
}
- void LoadExtensionOverridingHome(const std::string& index,
- const std::string& id,
- Manifest::Location location) {
- extensions::ExtensionBuilder builder;
- builder.SetManifest(extensions::DictionaryBuilder()
+ testing::AssertionResult LoadExtensionOverridingHome(
+ const std::string& index,
+ const std::string& id,
+ Manifest::Location location) {
+ ExtensionBuilder builder;
+ builder.SetManifest(DictionaryBuilder()
.Set("name", std::string("Extension " + index))
.Set("version", "1.0")
.Set("manifest_version", 2)
.Set("chrome_settings_overrides",
- extensions::DictionaryBuilder().Set(
+ DictionaryBuilder().Set(
"homepage", "http://www.google.com")));
builder.SetLocation(location);
builder.SetID(id);
service_->AddExtension(builder.Build().get());
+
+ if (ExtensionRegistry::Get(profile())->enabled_extensions().GetByID(id))
+ return testing::AssertionSuccess();
+ return testing::AssertionFailure() << "Could not install extension: " << id;
}
- void LoadExtensionOverridingStart(const std::string& index,
- const std::string& id,
- Manifest::Location location) {
- extensions::ExtensionBuilder builder;
- builder.SetManifest(extensions::DictionaryBuilder()
+ testing::AssertionResult LoadExtensionOverridingStart(
+ const std::string& index,
+ const std::string& id,
+ Manifest::Location location) {
+ ExtensionBuilder builder;
+ builder.SetManifest(DictionaryBuilder()
.Set("name", std::string("Extension " + index))
.Set("version", "1.0")
.Set("manifest_version", 2)
.Set("chrome_settings_overrides",
- extensions::DictionaryBuilder().Set(
+ DictionaryBuilder().Set(
"startup_pages",
- extensions::ListBuilder().Append(
+ ListBuilder().Append(
"http://www.google.com"))));
builder.SetLocation(location);
builder.SetID(id);
service_->AddExtension(builder.Build().get());
+
+ if (ExtensionRegistry::Get(profile())->enabled_extensions().GetByID(id))
+ return testing::AssertionSuccess();
+ return testing::AssertionFailure() << "Could not install extension: " << id;
}
- void LoadExtensionOverridingNtp(const std::string& index,
- const std::string& id,
- Manifest::Location location) {
- extensions::ExtensionBuilder builder;
- builder.SetManifest(extensions::DictionaryBuilder()
+ testing::AssertionResult LoadExtensionOverridingNtp(
+ const std::string& index,
+ const std::string& id,
+ Manifest::Location location) {
+ ExtensionBuilder builder;
+ builder.SetManifest(DictionaryBuilder()
.Set("name", std::string("Extension " + index))
.Set("version", "1.0")
.Set("manifest_version", 2)
.Set("chrome_url_overrides",
- extensions::DictionaryBuilder().Set(
+ DictionaryBuilder().Set(
"newtab", "Default.html")));
builder.SetLocation(location);
builder.SetID(id);
service_->AddExtension(builder.Build().get());
+
+ if (ExtensionRegistry::Get(profile())->enabled_extensions().GetByID(id))
+ return testing::AssertionSuccess();
+ return testing::AssertionFailure() << "Could not install extension: " << id;
+ }
+
+ testing::AssertionResult LoadExtensionOverridingProxy(
+ const std::string& index,
+ const std::string& id,
+ Manifest::Location location) {
+ ExtensionBuilder builder;
+ builder.SetManifest(DictionaryBuilder()
+ .Set("name", std::string("Extension " + index))
+ .Set("version", "1.0")
+ .Set("manifest_version", 2)
+ .Set("permissions",
+ ListBuilder().Append("proxy")));
+
+ builder.SetLocation(location);
+ builder.SetID(id);
+ service_->AddExtension(builder.Build().get());
+
+ // The proxy check relies on ExtensionPrefValueMap being up to date as to
+ // specifying which extension is controlling the proxy, but unfortunately
+ // that Map is not updated automatically for unit tests, so we simulate the
+ // update here to avoid test failures.
+ ExtensionPrefValueMap* extension_prefs_value_map =
+ ExtensionPrefValueMapFactory::GetForBrowserContext(profile());
+ extension_prefs_value_map->RegisterExtension(
+ id, base::Time::Now(), true, false);
Devlin 2014/06/05 19:42:54 nit: please document anonymous bools.
+ extension_prefs_value_map->SetExtensionPref(
+ id,
+ prefs::kProxy,
+ kExtensionPrefsScopeRegular,
+ base::Value::CreateStringValue(id));
Devlin 2014/06/05 19:42:55 nit: indentation mishap.
+
+ if (ExtensionRegistry::Get(profile())->enabled_extensions().GetByID(id))
+ return testing::AssertionSuccess();
+ return testing::AssertionFailure() << "Could not install extension: " << id;
}
void Init() {
@@ -348,9 +440,9 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_WipeoutControllerTest) {
Init();
// Add three extensions, and control two of them in this test (extension 1
// and 2).
- LoadExtensionWithAction("1", kId1, Manifest::COMMAND_LINE);
- LoadGenericExtension("2", kId2, Manifest::UNPACKED);
- LoadGenericExtension("3", kId3, Manifest::EXTERNAL_POLICY);
+ ASSERT_TRUE(LoadExtensionWithAction("1", kId1, Manifest::COMMAND_LINE));
+ ASSERT_TRUE(LoadGenericExtension("2", kId2, Manifest::UNPACKED));
+ ASSERT_TRUE(LoadGenericExtension("3", kId3, Manifest::EXTERNAL_POLICY));
scoped_ptr<TestSuspiciousExtensionBubbleController> controller(
new TestSuspiciousExtensionBubbleController(profile()));
@@ -425,9 +517,9 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_DevModeControllerTest) {
// Add three extensions, and control two of them in this test (extension 1
// and 2). Extension 1 is a regular extension, Extension 2 is UNPACKED so it
// counts as a DevMode extension.
- LoadExtensionWithAction("1", kId1, Manifest::COMMAND_LINE);
- LoadGenericExtension("2", kId2, Manifest::UNPACKED);
- LoadGenericExtension("3", kId3, Manifest::EXTERNAL_POLICY);
+ ASSERT_TRUE(LoadExtensionWithAction("1", kId1, Manifest::COMMAND_LINE));
+ ASSERT_TRUE(LoadGenericExtension("2", kId2, Manifest::UNPACKED));
+ ASSERT_TRUE(LoadGenericExtension("3", kId3, Manifest::EXTERNAL_POLICY));
scoped_ptr<TestDevModeBubbleController> controller(
new TestDevModeBubbleController(profile()));
@@ -451,8 +543,9 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_DevModeControllerTest) {
EXPECT_EQ(0U, controller->link_click_count());
EXPECT_EQ(0U, controller->action_click_count());
EXPECT_EQ(1U, controller->dismiss_click_count());
- EXPECT_TRUE(service_->GetExtensionById(kId1, false) != NULL);
- EXPECT_TRUE(service_->GetExtensionById(kId2, false) != NULL);
+ ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId2) != NULL);
// Do it again, but now press different button (Disable).
bubble.set_action_on_show(
@@ -467,8 +560,8 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_DevModeControllerTest) {
EXPECT_EQ(0U, controller->link_click_count());
EXPECT_EQ(1U, controller->action_click_count());
EXPECT_EQ(0U, controller->dismiss_click_count());
- EXPECT_TRUE(service_->GetExtensionById(kId1, false) == NULL);
- EXPECT_TRUE(service_->GetExtensionById(kId2, false) == NULL);
+ EXPECT_TRUE(registry->disabled_extensions().GetByID(kId1) != NULL);
+ EXPECT_TRUE(registry->disabled_extensions().GetByID(kId2) != NULL);
// Re-enable the extensions (disabled by the action button above).
service_->EnableExtension(kId1);
@@ -487,8 +580,8 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_DevModeControllerTest) {
EXPECT_EQ(1U, controller->link_click_count());
EXPECT_EQ(0U, controller->action_click_count());
EXPECT_EQ(0U, controller->dismiss_click_count());
- EXPECT_TRUE(service_->GetExtensionById(kId1, false) != NULL);
- EXPECT_TRUE(service_->GetExtensionById(kId2, false) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId2) != NULL);
// Now disable the unpacked extension.
service_->DisableExtension(kId1, Extension::DISABLE_USER_ACTION);
@@ -511,8 +604,7 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_DevModeControllerTest) {
TEST_F(ExtensionMessageBubbleTest, MAYBE_SettingsApiControllerTest) {
Init();
- extensions::ExtensionPrefs* prefs =
- extensions::ExtensionPrefs::Get(profile());
+ ExtensionPrefs* prefs = ExtensionPrefs::Get(profile());
for (int i = 0; i < 3; ++i) {
switch (static_cast<SettingsApiOverrideType>(i)) {
@@ -520,9 +612,10 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_SettingsApiControllerTest) {
// Load two extensions overriding home page and one overriding something
// unrelated (to check for interference). Extension 2 should still win
// on the home page setting.
- LoadExtensionOverridingHome("1", kId1, Manifest::UNPACKED);
- LoadExtensionOverridingHome("2", kId2, Manifest::UNPACKED);
- LoadExtensionOverridingStart("3", kId3, Manifest::UNPACKED);
+ ASSERT_TRUE(LoadExtensionOverridingHome("1", kId1, Manifest::UNPACKED));
+ ASSERT_TRUE(LoadExtensionOverridingHome("2", kId2, Manifest::UNPACKED));
+ ASSERT_TRUE(
+ LoadExtensionOverridingStart("3", kId3, Manifest::UNPACKED));
break;
case BUBBLE_TYPE_SEARCH_ENGINE:
// We deliberately skip testing the search engine since it relies on
@@ -535,9 +628,11 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_SettingsApiControllerTest) {
// Load two extensions overriding start page and one overriding
// something unrelated (to check for interference). Extension 2 should
// still win on the startup page setting.
- LoadExtensionOverridingStart("1", kId1, Manifest::UNPACKED);
- LoadExtensionOverridingStart("2", kId2, Manifest::UNPACKED);
- LoadExtensionOverridingHome("3", kId3, Manifest::UNPACKED);
+ ASSERT_TRUE(
+ LoadExtensionOverridingStart("1", kId1, Manifest::UNPACKED));
+ ASSERT_TRUE(
+ LoadExtensionOverridingStart("2", kId2, Manifest::UNPACKED));
+ ASSERT_TRUE(LoadExtensionOverridingHome("3", kId3, Manifest::UNPACKED));
break;
default:
NOTREACHED();
@@ -568,9 +663,10 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_SettingsApiControllerTest) {
EXPECT_EQ(0U, controller->action_click_count());
EXPECT_EQ(1U, controller->dismiss_click_count());
// No extension should have become disabled.
- EXPECT_TRUE(service_->GetExtensionById(kId1, false) != NULL);
- EXPECT_TRUE(service_->GetExtensionById(kId2, false) != NULL);
- EXPECT_TRUE(service_->GetExtensionById(kId3, false) != NULL);
+ ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId2) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId3) != NULL);
// Only extension 2 should have been acknowledged.
EXPECT_FALSE(prefs->HasSettingsApiBubbleBeenAcknowledged(kId1));
EXPECT_TRUE(prefs->HasSettingsApiBubbleBeenAcknowledged(kId2));
@@ -588,9 +684,9 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_SettingsApiControllerTest) {
EXPECT_EQ(0U, controller->action_click_count());
EXPECT_EQ(0U, controller->dismiss_click_count());
// No extension should have become disabled.
- EXPECT_TRUE(service_->GetExtensionById(kId1, false) != NULL);
- EXPECT_TRUE(service_->GetExtensionById(kId2, false) != NULL);
- EXPECT_TRUE(service_->GetExtensionById(kId3, false) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId2) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId3) != NULL);
// Only extension 2 should have been acknowledged.
EXPECT_FALSE(prefs->HasSettingsApiBubbleBeenAcknowledged(kId1));
EXPECT_TRUE(prefs->HasSettingsApiBubbleBeenAcknowledged(kId2));
@@ -611,9 +707,9 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_SettingsApiControllerTest) {
EXPECT_EQ(1U, controller->action_click_count());
EXPECT_EQ(0U, controller->dismiss_click_count());
// Only extension 2 should have become disabled.
- EXPECT_TRUE(service_->GetExtensionById(kId1, false) != NULL);
- EXPECT_TRUE(service_->GetExtensionById(kId2, false) == NULL);
- EXPECT_TRUE(service_->GetExtensionById(kId3, false) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL);
+ EXPECT_TRUE(registry->disabled_extensions().GetByID(kId2) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId3) != NULL);
// No extension should have been acknowledged (it got disabled).
EXPECT_FALSE(prefs->HasSettingsApiBubbleBeenAcknowledged(kId1));
EXPECT_FALSE(prefs->HasSettingsApiBubbleBeenAcknowledged(kId2));
@@ -635,14 +731,13 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_SettingsApiControllerTest) {
TEST_F(ExtensionMessageBubbleTest, MAYBE_NtpOverriddenControllerTest) {
Init();
- extensions::ExtensionPrefs* prefs =
- extensions::ExtensionPrefs::Get(profile());
+ ExtensionPrefs* prefs = ExtensionPrefs::Get(profile());
// Load two extensions overriding new tab page and one overriding something
// unrelated (to check for interference). Extension 2 should still win
// on the new tab page setting.
- LoadExtensionOverridingNtp("1", kId1, Manifest::UNPACKED);
- LoadExtensionOverridingNtp("2", kId2, Manifest::UNPACKED);
- LoadExtensionOverridingStart("3", kId3, Manifest::UNPACKED);
+ ASSERT_TRUE(LoadExtensionOverridingNtp("1", kId1, Manifest::UNPACKED));
+ ASSERT_TRUE(LoadExtensionOverridingNtp("2", kId2, Manifest::UNPACKED));
+ ASSERT_TRUE(LoadExtensionOverridingStart("3", kId3, Manifest::UNPACKED));
scoped_ptr<TestNtpOverriddenBubbleController> controller(
new TestNtpOverriddenBubbleController(profile()));
@@ -668,9 +763,10 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_NtpOverriddenControllerTest) {
EXPECT_EQ(0U, controller->action_click_count());
EXPECT_EQ(1U, controller->dismiss_click_count());
// No extension should have become disabled.
- EXPECT_TRUE(service_->GetExtensionById(kId1, false) != NULL);
- EXPECT_TRUE(service_->GetExtensionById(kId2, false) != NULL);
- EXPECT_TRUE(service_->GetExtensionById(kId3, false) != NULL);
+ ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId2) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId3) != NULL);
// Only extension 2 should have been acknowledged.
EXPECT_FALSE(prefs->HasNtpOverriddenBubbleBeenAcknowledged(kId1));
EXPECT_TRUE(prefs->HasNtpOverriddenBubbleBeenAcknowledged(kId2));
@@ -688,9 +784,9 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_NtpOverriddenControllerTest) {
EXPECT_EQ(0U, controller->action_click_count());
EXPECT_EQ(0U, controller->dismiss_click_count());
// No extension should have become disabled.
- EXPECT_TRUE(service_->GetExtensionById(kId1, false) != NULL);
- EXPECT_TRUE(service_->GetExtensionById(kId2, false) != NULL);
- EXPECT_TRUE(service_->GetExtensionById(kId3, false) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId2) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId3) != NULL);
// Only extension 2 should have been acknowledged.
EXPECT_FALSE(prefs->HasNtpOverriddenBubbleBeenAcknowledged(kId1));
EXPECT_TRUE(prefs->HasNtpOverriddenBubbleBeenAcknowledged(kId2));
@@ -710,9 +806,9 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_NtpOverriddenControllerTest) {
EXPECT_EQ(1U, controller->action_click_count());
EXPECT_EQ(0U, controller->dismiss_click_count());
// Only extension 2 should have become disabled.
- EXPECT_TRUE(service_->GetExtensionById(kId1, false) != NULL);
- EXPECT_TRUE(service_->GetExtensionById(kId2, false) == NULL);
- EXPECT_TRUE(service_->GetExtensionById(kId3, false) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL);
+ EXPECT_TRUE(registry->disabled_extensions().GetByID(kId2) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId3) != NULL);
// No extension should have been acknowledged (it got disabled).
EXPECT_FALSE(prefs->HasNtpOverriddenBubbleBeenAcknowledged(kId1));
EXPECT_FALSE(prefs->HasNtpOverriddenBubbleBeenAcknowledged(kId2));
@@ -724,4 +820,124 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_NtpOverriddenControllerTest) {
service_->UninstallExtension(kId3, false, NULL);
}
+void SetInstallTime(const std::string& extension_id,
+ const base::Time& time,
+ ExtensionPrefs* prefs) {
+ std::string time_str = base::Int64ToString(time.ToInternalValue());
+ prefs->UpdateExtensionPref(extension_id,
+ "install_time",
+ new base::StringValue(time_str));
+}
+
+// The feature this is meant to test is only implemented on Windows.
+#if defined(OS_WIN)
+#define MAYBE_ProxyOverriddenControllerTest ProxyOverriddenControllerTest
+#else
+#define MAYBE_ProxyOverriddenControllerTest DISABLED_ProxyOverriddenControllerTest
+#endif
+
+TEST_F(ExtensionMessageBubbleTest, MAYBE_ProxyOverriddenControllerTest) {
+ Init();
+ ExtensionPrefs* prefs = ExtensionPrefs::Get(profile());
+ // Load two extensions overriding proxy and one overriding something
+ // unrelated (to check for interference). Extension 2 should still win
+ // on the proxy setting.
+ ASSERT_TRUE(LoadExtensionOverridingProxy("1", kId1, Manifest::UNPACKED));
+ ASSERT_TRUE(LoadExtensionOverridingProxy("2", kId2, Manifest::UNPACKED));
+ ASSERT_TRUE(LoadExtensionOverridingStart("3", kId3, Manifest::UNPACKED));
+
+ // The bubble will not show if the extension was installed in the last 7 days
+ // so we artificially set the install time to simulate an old install during
+ // testing.
+ base::Time old_enough = base::Time::Now() - base::TimeDelta::FromDays(8);
+ SetInstallTime(kId1, old_enough, prefs);
+ SetInstallTime(kId2, base::Time::Now(), prefs);
+ SetInstallTime(kId3, old_enough, prefs);
+
+ scoped_ptr<TestProxyOverriddenBubbleController> controller(
+ new TestProxyOverriddenBubbleController(profile()));
+
+ // The second extension is too new to warn about.
+ EXPECT_FALSE(controller->ShouldShow(kId1));
+ EXPECT_FALSE(controller->ShouldShow(kId2));
+ // Lets make it old enough.
+ SetInstallTime(kId2, old_enough, prefs);
+
+ // The list will contain one enabled unpacked extension (ext 2).
+ EXPECT_TRUE(controller->ShouldShow(kId2));
+ EXPECT_FALSE(controller->ShouldShow(kId3));
+ std::vector<base::string16> override_extensions =
+ controller->GetExtensionList();
+ ASSERT_EQ(1U, override_extensions.size());
+ EXPECT_EQ(base::ASCIIToUTF16("Extension 2"), override_extensions[0]);
+ EXPECT_EQ(0U, controller->link_click_count());
+ EXPECT_EQ(0U, controller->dismiss_click_count());
+ EXPECT_EQ(0U, controller->action_click_count());
+
+ // Simulate showing the bubble and dismissing it.
+ FakeExtensionMessageBubble bubble;
+ bubble.set_action_on_show(
+ FakeExtensionMessageBubble::BUBBLE_ACTION_CLICK_DISMISS_BUTTON);
+ controller->Show(&bubble);
+ EXPECT_EQ(0U, controller->link_click_count());
+ EXPECT_EQ(0U, controller->action_click_count());
+ EXPECT_EQ(1U, controller->dismiss_click_count());
+ // No extension should have become disabled.
+ ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId2) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId3) != NULL);
+ // Only extension 2 should have been acknowledged.
+ EXPECT_FALSE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId1));
+ EXPECT_TRUE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId2));
+ EXPECT_FALSE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId3));
+ // Clean up after ourselves.
+ prefs->SetProxyOverriddenBubbleBeenAcknowledged(kId2, false);
+
+ // Simulate clicking the learn more link to dismiss it.
+ bubble.set_action_on_show(
+ FakeExtensionMessageBubble::BUBBLE_ACTION_CLICK_LINK);
+ controller.reset(new TestProxyOverriddenBubbleController(profile()));
+ EXPECT_TRUE(controller->ShouldShow(kId2));
+ controller->Show(&bubble);
+ EXPECT_EQ(1U, controller->link_click_count());
+ EXPECT_EQ(0U, controller->action_click_count());
+ EXPECT_EQ(0U, controller->dismiss_click_count());
+ // No extension should have become disabled.
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId2) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId3) != NULL);
+ // Only extension 2 should have been acknowledged.
+ EXPECT_FALSE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId1));
+ EXPECT_TRUE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId2));
+ EXPECT_FALSE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId3));
+ // Clean up after ourselves.
+ prefs->SetProxyOverriddenBubbleBeenAcknowledged(kId2, false);
+
+ // Do it again, but now opt to disable the extension.
+ bubble.set_action_on_show(
+ FakeExtensionMessageBubble::BUBBLE_ACTION_CLICK_ACTION_BUTTON);
+ controller.reset(new TestProxyOverriddenBubbleController(profile()));
+ EXPECT_TRUE(controller->ShouldShow(kId2));
+ override_extensions = controller->GetExtensionList();
+ EXPECT_EQ(1U, override_extensions.size());
+ controller->Show(&bubble); // Simulate showing the bubble.
+ EXPECT_EQ(0U, controller->link_click_count());
+ EXPECT_EQ(1U, controller->action_click_count());
+ EXPECT_EQ(0U, controller->dismiss_click_count());
+ // Only extension 2 should have become disabled.
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL);
+ EXPECT_TRUE(registry->disabled_extensions().GetByID(kId2) != NULL);
+ EXPECT_TRUE(registry->enabled_extensions().GetByID(kId3) != NULL);
+ // No extension should have been acknowledged (it got disabled).
+ EXPECT_FALSE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId1));
+ EXPECT_FALSE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId2));
+ EXPECT_FALSE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId3));
+
+ // Clean up after ourselves.
+ service_->UninstallExtension(kId1, false, NULL);
+ service_->UninstallExtension(kId2, false, NULL);
+ service_->UninstallExtension(kId3, false, NULL);
+}
+
} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/extension_message_bubble_controller.h ('k') | chrome/browser/extensions/ntp_overridden_bubble_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698