| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/files/file_path.h" | 5 #include "base/files/file_path.h" |
| 6 #include "base/files/scoped_temp_dir.h" | 6 #include "base/files/scoped_temp_dir.h" |
| 7 #include "base/threading/sequenced_worker_pool.h" | 7 #include "base/threading/sequenced_worker_pool.h" |
| 8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
| 9 #include "chrome/browser/extensions/extension_browsertest.h" | 9 #include "chrome/browser/extensions/extension_browsertest.h" |
| 10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
| 11 #include "chrome/browser/extensions/extension_sync_service.h" | 11 #include "chrome/browser/extensions/extension_sync_service.h" |
| 12 #include "chrome/browser/extensions/extension_uninstall_dialog.h" | 12 #include "chrome/browser/extensions/extension_uninstall_dialog.h" |
| 13 #include "chrome/browser/extensions/updater/extension_updater.h" | 13 #include "chrome/browser/extensions/updater/extension_updater.h" |
| 14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
| 16 #include "chrome/browser/ui/global_error/global_error.h" | 16 #include "chrome/browser/ui/global_error/global_error.h" |
| 17 #include "chrome/browser/ui/global_error/global_error_service.h" | 17 #include "chrome/browser/ui/global_error/global_error_service.h" |
| 18 #include "chrome/browser/ui/global_error/global_error_service_factory.h" | 18 #include "chrome/browser/ui/global_error/global_error_service_factory.h" |
| 19 #include "chrome/common/chrome_switches.h" | 19 #include "chrome/common/chrome_switches.h" |
| 20 #include "content/public/browser/browser_thread.h" | 20 #include "content/public/browser/browser_thread.h" |
| 21 #include "content/public/test/test_utils.h" | 21 #include "content/public/test/test_utils.h" |
| 22 #include "extensions/browser/extension_dialog_auto_confirm.h" |
| 22 #include "extensions/browser/extension_prefs.h" | 23 #include "extensions/browser/extension_prefs.h" |
| 23 #include "extensions/browser/extension_registry.h" | 24 #include "extensions/browser/extension_registry.h" |
| 24 #include "extensions/browser/extension_system.h" | 25 #include "extensions/browser/extension_system.h" |
| 25 #include "extensions/common/extension.h" | 26 #include "extensions/common/extension.h" |
| 26 #include "net/url_request/test_url_request_interceptor.h" | 27 #include "net/url_request/test_url_request_interceptor.h" |
| 27 #include "sync/protocol/extension_specifics.pb.h" | 28 #include "sync/protocol/extension_specifics.pb.h" |
| 28 #include "sync/protocol/sync.pb.h" | 29 #include "sync/protocol/sync.pb.h" |
| 29 | 30 |
| 30 using content::BrowserThread; | 31 using content::BrowserThread; |
| 31 using extensions::Extension; | 32 using extensions::Extension; |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 const size_t size_before = registry_->enabled_extensions().size(); | 141 const size_t size_before = registry_->enabled_extensions().size(); |
| 141 | 142 |
| 142 UninstallExtension(extension->id()); | 143 UninstallExtension(extension->id()); |
| 143 EXPECT_EQ(size_before, registry_->enabled_extensions().size()); | 144 EXPECT_EQ(size_before, registry_->enabled_extensions().size()); |
| 144 EXPECT_EQ(0u, registry_->disabled_extensions().size()); | 145 EXPECT_EQ(0u, registry_->disabled_extensions().size()); |
| 145 ASSERT_FALSE(GetExtensionDisabledGlobalError()); | 146 ASSERT_FALSE(GetExtensionDisabledGlobalError()); |
| 146 } | 147 } |
| 147 | 148 |
| 148 // Tests uninstalling a disabled extension with an uninstall dialog. | 149 // Tests uninstalling a disabled extension with an uninstall dialog. |
| 149 IN_PROC_BROWSER_TEST_F(ExtensionDisabledGlobalErrorTest, UninstallFromDialog) { | 150 IN_PROC_BROWSER_TEST_F(ExtensionDisabledGlobalErrorTest, UninstallFromDialog) { |
| 150 extensions::ExtensionUninstallDialog::ScopedAutoConfirm auto_confirm( | 151 extensions::ScopedTestDialogAutoConfirm auto_confirm( |
| 151 extensions::ExtensionUninstallDialog::ACCEPT); | 152 extensions::ScopedTestDialogAutoConfirm::ACCEPT); |
| 152 const Extension* extension = InstallAndUpdateIncreasingPermissionsExtension(); | 153 const Extension* extension = InstallAndUpdateIncreasingPermissionsExtension(); |
| 153 ASSERT_TRUE(extension); | 154 ASSERT_TRUE(extension); |
| 154 std::string extension_id = extension->id(); | 155 std::string extension_id = extension->id(); |
| 155 GlobalErrorWithStandardBubble* error = | 156 GlobalErrorWithStandardBubble* error = |
| 156 static_cast<GlobalErrorWithStandardBubble*>( | 157 static_cast<GlobalErrorWithStandardBubble*>( |
| 157 GetExtensionDisabledGlobalError()); | 158 GetExtensionDisabledGlobalError()); |
| 158 ASSERT_TRUE(error); | 159 ASSERT_TRUE(error); |
| 159 | 160 |
| 160 // The "cancel" button is the uninstall button on the browser. | 161 // The "cancel" button is the uninstall button on the browser. |
| 161 error->BubbleViewCancelButtonPressed(browser()); | 162 error->BubbleViewCancelButtonPressed(browser()); |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 | 268 |
| 268 const Extension* extension = service_->GetExtensionById(extension_id, true); | 269 const Extension* extension = service_->GetExtensionById(extension_id, true); |
| 269 ASSERT_TRUE(extension); | 270 ASSERT_TRUE(extension); |
| 270 EXPECT_EQ("2", extension->VersionString()); | 271 EXPECT_EQ("2", extension->VersionString()); |
| 271 EXPECT_EQ(1u, registry_->disabled_extensions().size()); | 272 EXPECT_EQ(1u, registry_->disabled_extensions().size()); |
| 272 EXPECT_EQ(Extension::DISABLE_REMOTE_INSTALL, | 273 EXPECT_EQ(Extension::DISABLE_REMOTE_INSTALL, |
| 273 ExtensionPrefs::Get(service_->profile()) | 274 ExtensionPrefs::Get(service_->profile()) |
| 274 ->GetDisableReasons(extension_id)); | 275 ->GetDisableReasons(extension_id)); |
| 275 EXPECT_TRUE(GetExtensionDisabledGlobalError()); | 276 EXPECT_TRUE(GetExtensionDisabledGlobalError()); |
| 276 } | 277 } |
| OLD | NEW |