| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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/external_provider_impl.h" | 5 #include "chrome/browser/extensions/external_provider_impl.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 service_->CheckForExternalUpdates(); | 143 service_->CheckForExternalUpdates(); |
| 144 content::WindowedNotificationObserver( | 144 content::WindowedNotificationObserver( |
| 145 extensions::NOTIFICATION_CRX_INSTALLER_DONE, | 145 extensions::NOTIFICATION_CRX_INSTALLER_DONE, |
| 146 content::NotificationService::AllSources()).Wait(); | 146 content::NotificationService::AllSources()).Wait(); |
| 147 | 147 |
| 148 EXPECT_TRUE(service_->GetInstalledExtension(kStandaloneAppId)); | 148 EXPECT_TRUE(service_->GetInstalledExtension(kStandaloneAppId)); |
| 149 } | 149 } |
| 150 | 150 |
| 151 // User signed in, sync service started, install app when sync is disabled by | 151 // User signed in, sync service started, install app when sync is disabled by |
| 152 // policy. | 152 // policy. |
| 153 TEST_F(ExternalProviderImplChromeOSTest, PolicyDisabled) { | 153 // flaky: crbug.com/706506 |
| 154 TEST_F(ExternalProviderImplChromeOSTest, DISABLED_PolicyDisabled) { |
| 154 InitServiceWithExternalProviders(true); | 155 InitServiceWithExternalProviders(true); |
| 155 | 156 |
| 156 // Log user in, start sync. | 157 // Log user in, start sync. |
| 157 TestingBrowserProcess::GetGlobal()->SetProfileManager( | 158 TestingBrowserProcess::GetGlobal()->SetProfileManager( |
| 158 new ProfileManagerWithoutInit(temp_dir().GetPath())); | 159 new ProfileManagerWithoutInit(temp_dir().GetPath())); |
| 159 SigninManagerBase* signin = | 160 SigninManagerBase* signin = |
| 160 SigninManagerFactory::GetForProfile(profile_.get()); | 161 SigninManagerFactory::GetForProfile(profile_.get()); |
| 161 signin->SetAuthenticatedAccountInfo("gaia-id-test_user@gmail.com", | 162 signin->SetAuthenticatedAccountInfo("gaia-id-test_user@gmail.com", |
| 162 "test_user@gmail.com"); | 163 "test_user@gmail.com"); |
| 163 ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get()) | 164 ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get()) |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 new syncer::SyncErrorFactoryMock())); | 204 new syncer::SyncErrorFactoryMock())); |
| 204 | 205 |
| 205 content::WindowedNotificationObserver( | 206 content::WindowedNotificationObserver( |
| 206 extensions::NOTIFICATION_CRX_INSTALLER_DONE, | 207 extensions::NOTIFICATION_CRX_INSTALLER_DONE, |
| 207 content::NotificationService::AllSources()).Wait(); | 208 content::NotificationService::AllSources()).Wait(); |
| 208 | 209 |
| 209 EXPECT_TRUE(service_->GetInstalledExtension(kStandaloneAppId)); | 210 EXPECT_TRUE(service_->GetInstalledExtension(kStandaloneAppId)); |
| 210 } | 211 } |
| 211 | 212 |
| 212 } // namespace extensions | 213 } // namespace extensions |
| OLD | NEW |