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/bind.h" | 5 #include "base/bind.h" |
6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
7 #include "base/memory/ref_counted.h" | 7 #include "base/memory/ref_counted.h" |
8 #include "base/stl_util.h" | 8 #include "base/stl_util.h" |
9 #include "chrome/browser/extensions/extension_browsertest.h" | 9 #include "chrome/browser/extensions/extension_browsertest.h" |
10 #include "chrome/browser/extensions/extension_host.h" | 10 #include "chrome/browser/extensions/extension_host.h" |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 ASSERT_TRUE(extension); | 108 ASSERT_TRUE(extension); |
109 | 109 |
110 // Cancel this install. | 110 // Cancel this install. |
111 ASSERT_FALSE(StartInstallButCancel( | 111 ASSERT_FALSE(StartInstallButCancel( |
112 test_data_dir_.AppendASCII("install/install_v2.crx"))); | 112 test_data_dir_.AppendASCII("install/install_v2.crx"))); |
113 EXPECT_TRUE(IsExtensionAtVersion(extension, "1.0")); | 113 EXPECT_TRUE(IsExtensionAtVersion(extension, "1.0")); |
114 } | 114 } |
115 | 115 |
116 #if defined(OS_WIN) | 116 #if defined(OS_WIN) |
117 // http://crbug.com/141913 | 117 // http://crbug.com/141913 |
118 #define MAYBE_InstallRequiresConfirm FLAKY_InstallRequiresConfirm | 118 #define MAYBE_InstallRequiresConfirm DISABLED_InstallRequiresConfirm |
119 #else | 119 #else |
120 #define MAYBE_InstallRequiresConfirm InstallRequiresConfirm | 120 #define MAYBE_InstallRequiresConfirm InstallRequiresConfirm |
121 #endif | 121 #endif |
122 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, MAYBE_InstallRequiresConfirm) { | 122 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, MAYBE_InstallRequiresConfirm) { |
123 // Installing the extension without an auto confirming UI should result in | 123 // Installing the extension without an auto confirming UI should result in |
124 // it being disabled, since good.crx has permissions that require approval. | 124 // it being disabled, since good.crx has permissions that require approval. |
125 ExtensionService* service = extensions::ExtensionSystem::Get( | 125 ExtensionService* service = extensions::ExtensionSystem::Get( |
126 browser()->profile())->extension_service(); | 126 browser()->profile())->extension_service(); |
127 std::string id = "ldnnhddmnhbkjipkidpdiheffobcpfmf"; | 127 std::string id = "ldnnhddmnhbkjipkidpdiheffobcpfmf"; |
128 ASSERT_FALSE(InstallExtension(test_data_dir_.AppendASCII("good.crx"), 0)); | 128 ASSERT_FALSE(InstallExtension(test_data_dir_.AppendASCII("good.crx"), 0)); |
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
642 forcelist, kExtensionId, "http://localhost/autoupdate/manifest"); | 642 forcelist, kExtensionId, "http://localhost/autoupdate/manifest"); |
643 } | 643 } |
644 ASSERT_TRUE(WaitForExtensionInstall()); | 644 ASSERT_TRUE(WaitForExtensionInstall()); |
645 ASSERT_EQ(size_before + 1, service->extensions()->size()); | 645 ASSERT_EQ(size_before + 1, service->extensions()->size()); |
646 extension = service->GetExtensionById(kExtensionId, false); | 646 extension = service->GetExtensionById(kExtensionId, false); |
647 ASSERT_TRUE(extension); | 647 ASSERT_TRUE(extension); |
648 EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD, extension->location()); | 648 EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD, extension->location()); |
649 EXPECT_TRUE(service->IsExtensionEnabled(kExtensionId)); | 649 EXPECT_TRUE(service->IsExtensionEnabled(kExtensionId)); |
650 EXPECT_TRUE(service->disabled_extensions()->is_empty()); | 650 EXPECT_TRUE(service->disabled_extensions()->is_empty()); |
651 } | 651 } |
OLD | NEW |