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/memory/ref_counted.h" | 5 #include "base/memory/ref_counted.h" |
6 #include "base/stl_util.h" | 6 #include "base/stl_util.h" |
7 #include "chrome/browser/extensions/autoupdate_interceptor.h" | 7 #include "chrome/browser/extensions/autoupdate_interceptor.h" |
8 #include "chrome/browser/extensions/extension_browsertest.h" | 8 #include "chrome/browser/extensions/extension_browsertest.h" |
9 #include "chrome/browser/extensions/extension_host.h" | 9 #include "chrome/browser/extensions/extension_host.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
215 bool finished_; | 215 bool finished_; |
216 | 216 |
217 // The set of extension id's we've seen via EXTENSION_UPDATE_FOUND. | 217 // The set of extension id's we've seen via EXTENSION_UPDATE_FOUND. |
218 std::set<std::string> updates_; | 218 std::set<std::string> updates_; |
219 }; | 219 }; |
220 | 220 |
221 #if defined(OS_WIN) | 221 #if defined(OS_WIN) |
222 // Fails consistently on Windows XP, see: http://crbug.com/120640. | 222 // Fails consistently on Windows XP, see: http://crbug.com/120640. |
223 #define MAYBE_AutoUpdate DISABLED_AutoUpdate | 223 #define MAYBE_AutoUpdate DISABLED_AutoUpdate |
224 #else | 224 #else |
| 225 #if defined(ADDRESS_SANITIZER) |
| 226 #define MAYBE_AutoUpdate DISABLED_AutoUpdate |
| 227 #else |
225 #define MAYBE_AutoUpdate AutoUpdate | 228 #define MAYBE_AutoUpdate AutoUpdate |
226 #endif | 229 #endif |
| 230 #endif |
227 | 231 |
228 // Tests extension autoupdate. | 232 // Tests extension autoupdate. |
229 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, MAYBE_AutoUpdate) { | 233 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, MAYBE_AutoUpdate) { |
230 NotificationListener notification_listener; | 234 NotificationListener notification_listener; |
231 FilePath basedir = test_data_dir_.AppendASCII("autoupdate"); | 235 FilePath basedir = test_data_dir_.AppendASCII("autoupdate"); |
232 // Note: This interceptor gets requests on the IO thread. | 236 // Note: This interceptor gets requests on the IO thread. |
233 scoped_refptr<AutoUpdateInterceptor> interceptor(new AutoUpdateInterceptor()); | 237 scoped_refptr<AutoUpdateInterceptor> interceptor(new AutoUpdateInterceptor()); |
234 content::URLFetcher::SetEnableInterceptionForTests(true); | 238 content::URLFetcher::SetEnableInterceptionForTests(true); |
235 | 239 |
236 interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest", | 240 interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest", |
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
592 std::string(kExtensionId) + ";http://localhost/autoupdate/manifest")); | 596 std::string(kExtensionId) + ";http://localhost/autoupdate/manifest")); |
593 } | 597 } |
594 ASSERT_TRUE(WaitForExtensionInstall()); | 598 ASSERT_TRUE(WaitForExtensionInstall()); |
595 ASSERT_EQ(size_before + 1, service->extensions()->size()); | 599 ASSERT_EQ(size_before + 1, service->extensions()->size()); |
596 extension = service->GetExtensionById(kExtensionId, false); | 600 extension = service->GetExtensionById(kExtensionId, false); |
597 ASSERT_TRUE(extension); | 601 ASSERT_TRUE(extension); |
598 EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD, extension->location()); | 602 EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD, extension->location()); |
599 EXPECT_TRUE(service->IsExtensionEnabled(kExtensionId)); | 603 EXPECT_TRUE(service->IsExtensionEnabled(kExtensionId)); |
600 EXPECT_TRUE(service->disabled_extensions()->is_empty()); | 604 EXPECT_TRUE(service->disabled_extensions()->is_empty()); |
601 } | 605 } |
OLD | NEW |