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/prefs/scoped_user_pref_update.h" | 8 #include "base/prefs/scoped_user_pref_update.h" |
9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
428 ASSERT_FALSE(listener2.was_satisfied()); | 428 ASSERT_FALSE(listener2.was_satisfied()); |
429 EnableExtension(extension->id()); | 429 EnableExtension(extension->id()); |
430 listener2.WaitUntilSatisfied(); | 430 listener2.WaitUntilSatisfied(); |
431 ASSERT_TRUE(notification_listener.started()); | 431 ASSERT_TRUE(notification_listener.started()); |
432 ASSERT_TRUE(notification_listener.finished()); | 432 ASSERT_TRUE(notification_listener.finished()); |
433 ASSERT_TRUE(ContainsKey(notification_listener.updates(), | 433 ASSERT_TRUE(ContainsKey(notification_listener.updates(), |
434 "ogjcoiohnmldgjemafoockdghcjciccf")); | 434 "ogjcoiohnmldgjemafoockdghcjciccf")); |
435 notification_listener.Reset(); | 435 notification_listener.Reset(); |
436 } | 436 } |
437 | 437 |
438 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalUrlUpdate) { | 438 // Temporarily disabled in official builds. See crbug.com/567497 for details. |
| 439 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN) |
| 440 #define MAYBE_ExternalUrlUpdate DISABLED_ExternalUrlUpdate |
| 441 #else |
| 442 #define MAYBE_ExternalUrlUpdate ExternalUrlUpdate |
| 443 #endif // defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN) |
| 444 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, MAYBE_ExternalUrlUpdate) { |
439 ExtensionService* service = extensions::ExtensionSystem::Get( | 445 ExtensionService* service = extensions::ExtensionSystem::Get( |
440 browser()->profile())->extension_service(); | 446 browser()->profile())->extension_service(); |
441 const char kExtensionId[] = "ogjcoiohnmldgjemafoockdghcjciccf"; | 447 const char kExtensionId[] = "ogjcoiohnmldgjemafoockdghcjciccf"; |
442 extensions::ExtensionUpdater::CheckParams params; | 448 extensions::ExtensionUpdater::CheckParams params; |
443 | 449 |
444 base::FilePath basedir = test_data_dir_.AppendASCII("autoupdate"); | 450 base::FilePath basedir = test_data_dir_.AppendASCII("autoupdate"); |
445 | 451 |
446 // Note: This interceptor gets requests on the IO thread. | 452 // Note: This interceptor gets requests on the IO thread. |
447 net::LocalHostTestURLRequestInterceptor interceptor( | 453 net::LocalHostTestURLRequestInterceptor interceptor( |
448 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), | 454 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), |
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
710 UpdateProviderPolicy(policies); | 716 UpdateProviderPolicy(policies); |
711 extension_observer.WaitForExtensionWillBeInstalled(); | 717 extension_observer.WaitForExtensionWillBeInstalled(); |
712 | 718 |
713 ASSERT_EQ(size_before + 1, registry->enabled_extensions().size()); | 719 ASSERT_EQ(size_before + 1, registry->enabled_extensions().size()); |
714 extension = service->GetExtensionById(kExtensionId, false); | 720 extension = service->GetExtensionById(kExtensionId, false); |
715 ASSERT_TRUE(extension); | 721 ASSERT_TRUE(extension); |
716 EXPECT_EQ(Manifest::EXTERNAL_POLICY_DOWNLOAD, extension->location()); | 722 EXPECT_EQ(Manifest::EXTERNAL_POLICY_DOWNLOAD, extension->location()); |
717 EXPECT_TRUE(service->IsExtensionEnabled(kExtensionId)); | 723 EXPECT_TRUE(service->IsExtensionEnabled(kExtensionId)); |
718 EXPECT_TRUE(registry->disabled_extensions().is_empty()); | 724 EXPECT_TRUE(registry->disabled_extensions().is_empty()); |
719 } | 725 } |
OLD | NEW |