| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "chrome/browser/extensions/extension_service_unittest.h" | 5 #include "chrome/browser/extensions/extension_service_unittest.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 #include "sync/api/string_ordinal.h" | 97 #include "sync/api/string_ordinal.h" |
| 98 #include "sync/api/sync_error_factory.h" | 98 #include "sync/api/sync_error_factory.h" |
| 99 #include "sync/api/sync_error_factory_mock.h" | 99 #include "sync/api/sync_error_factory_mock.h" |
| 100 #include "sync/protocol/app_specifics.pb.h" | 100 #include "sync/protocol/app_specifics.pb.h" |
| 101 #include "sync/protocol/extension_specifics.pb.h" | 101 #include "sync/protocol/extension_specifics.pb.h" |
| 102 #include "sync/protocol/sync.pb.h" | 102 #include "sync/protocol/sync.pb.h" |
| 103 #include "testing/gtest/include/gtest/gtest.h" | 103 #include "testing/gtest/include/gtest/gtest.h" |
| 104 #include "testing/platform_test.h" | 104 #include "testing/platform_test.h" |
| 105 #include "webkit/base/origin_url_conversions.h" | 105 #include "webkit/base/origin_url_conversions.h" |
| 106 #include "webkit/browser/database/database_tracker.h" | 106 #include "webkit/browser/database/database_tracker.h" |
| 107 #include "webkit/browser/quota/quota_manager.h" |
| 107 #include "webkit/plugins/npapi/mock_plugin_list.h" | 108 #include "webkit/plugins/npapi/mock_plugin_list.h" |
| 108 #include "webkit/quota/quota_manager.h" | |
| 109 | 109 |
| 110 #if defined(OS_CHROMEOS) | 110 #if defined(OS_CHROMEOS) |
| 111 #include "chrome/browser/chromeos/extensions/install_limiter.h" | 111 #include "chrome/browser/chromeos/extensions/install_limiter.h" |
| 112 #include "chrome/browser/chromeos/login/user_manager.h" | 112 #include "chrome/browser/chromeos/login/user_manager.h" |
| 113 #include "chrome/browser/chromeos/settings/cros_settings.h" | 113 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 114 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 114 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
| 115 #endif | 115 #endif |
| 116 | 116 |
| 117 using content::BrowserContext; | 117 using content::BrowserContext; |
| 118 using content::BrowserThread; | 118 using content::BrowserThread; |
| (...skipping 5875 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5994 new MockExtensionProvider(service_, Manifest::EXTERNAL_PREF); | 5994 new MockExtensionProvider(service_, Manifest::EXTERNAL_PREF); |
| 5995 AddMockExternalProvider(provider); | 5995 AddMockExternalProvider(provider); |
| 5996 provider->UpdateOrAddExtension(updates_from_webstore, "1", crx_path); | 5996 provider->UpdateOrAddExtension(updates_from_webstore, "1", crx_path); |
| 5997 | 5997 |
| 5998 service_->CheckForExternalUpdates(); | 5998 service_->CheckForExternalUpdates(); |
| 5999 loop_.RunUntilIdle(); | 5999 loop_.RunUntilIdle(); |
| 6000 EXPECT_TRUE(extensions::HasExternalInstallError(service_)); | 6000 EXPECT_TRUE(extensions::HasExternalInstallError(service_)); |
| 6001 EXPECT_FALSE(extensions::HasExternalInstallBubble(service_)); | 6001 EXPECT_FALSE(extensions::HasExternalInstallBubble(service_)); |
| 6002 EXPECT_FALSE(service_->IsExtensionEnabled(updates_from_webstore)); | 6002 EXPECT_FALSE(service_->IsExtensionEnabled(updates_from_webstore)); |
| 6003 } | 6003 } |
| OLD | NEW |