| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <memory> | 5 #include <memory> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/dir_reader_posix.h" | 8 #include "base/files/dir_reader_posix.h" |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 net::URLRequestStatus::SUCCESS); | 271 net::URLRequestStatus::SUCCESS); |
| 272 } | 272 } |
| 273 | 273 |
| 274 LocalPolicyTestServer policy_test_server_; | 274 LocalPolicyTestServer policy_test_server_; |
| 275 net::URLFetcherImplFactory fetcher_impl_factory_; | 275 net::URLFetcherImplFactory fetcher_impl_factory_; |
| 276 net::FakeURLFetcherFactory fetcher_factory_; | 276 net::FakeURLFetcherFactory fetcher_factory_; |
| 277 base::FilePath component_policy_cache_dir_; | 277 base::FilePath component_policy_cache_dir_; |
| 278 std::unique_ptr<base::AutoReset<bool>> signin_policy_provided_disabler_; | 278 std::unique_ptr<base::AutoReset<bool>> signin_policy_provided_disabler_; |
| 279 }; | 279 }; |
| 280 | 280 |
| 281 // DISABLED: see crbug.com/666720, crbug.com/644304. TODO(emaxx): Enable the |
| 282 // test back. |
| 281 IN_PROC_BROWSER_TEST_F(SigninExtensionsDeviceCloudPolicyBrowserTest, | 283 IN_PROC_BROWSER_TEST_F(SigninExtensionsDeviceCloudPolicyBrowserTest, |
| 282 InstallAndRunInWindow) { | 284 DISABLED_InstallAndRunInWindow) { |
| 283 const extensions::Extension* extension = InstallAndLoadTestExtension(); | 285 const extensions::Extension* extension = InstallAndLoadTestExtension(); |
| 284 ASSERT_TRUE(extension); | 286 ASSERT_TRUE(extension); |
| 285 Browser* browser = CreateBrowser(GetSigninProfile()); | 287 Browser* browser = CreateBrowser(GetSigninProfile()); |
| 286 extensions::ResultCatcher result_catcher; | 288 extensions::ResultCatcher result_catcher; |
| 287 ui_test_utils::NavigateToURL( | 289 ui_test_utils::NavigateToURL( |
| 288 browser, extension->GetResourceURL(kTestExtensionTestPage)); | 290 browser, extension->GetResourceURL(kTestExtensionTestPage)); |
| 289 EXPECT_TRUE(result_catcher.GetNextResult()); | 291 EXPECT_TRUE(result_catcher.GetNextResult()); |
| 290 CloseBrowserSynchronously(browser); | 292 CloseBrowserSynchronously(browser); |
| 291 } | 293 } |
| 292 | 294 |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 &cache_dir)); | 349 &cache_dir)); |
| 348 | 350 |
| 349 ResourceCache cache(cache_dir, new base::NullTaskRunner); | 351 ResourceCache cache(cache_dir, new base::NullTaskRunner); |
| 350 EXPECT_TRUE(cache.Store(kPolicyProtoCacheKey, kTestExtensionId, | 352 EXPECT_TRUE(cache.Store(kPolicyProtoCacheKey, kTestExtensionId, |
| 351 BuildTestComponentPolicy().SerializeAsString())); | 353 BuildTestComponentPolicy().SerializeAsString())); |
| 352 EXPECT_TRUE( | 354 EXPECT_TRUE( |
| 353 cache.Store(kPolicyDataCacheKey, kTestExtensionId, kFakePolicy)); | 355 cache.Store(kPolicyDataCacheKey, kTestExtensionId, kFakePolicy)); |
| 354 } | 356 } |
| 355 }; | 357 }; |
| 356 | 358 |
| 359 // DISABLED: see crbug.com/666720, crbug.com/644304. TODO(emaxx): Enable the |
| 360 // test back. |
| 357 IN_PROC_BROWSER_TEST_F(PreinstalledSigninExtensionsDeviceCloudPolicyBrowserTest, | 361 IN_PROC_BROWSER_TEST_F(PreinstalledSigninExtensionsDeviceCloudPolicyBrowserTest, |
| 358 OfflineStart) { | 362 DISABLED_OfflineStart) { |
| 359 const extensions::Extension* extension = GetTestExtension(); | 363 const extensions::Extension* extension = GetTestExtension(); |
| 360 ASSERT_TRUE(extension); | 364 ASSERT_TRUE(extension); |
| 361 Browser* browser = CreateBrowser(GetSigninProfile()); | 365 Browser* browser = CreateBrowser(GetSigninProfile()); |
| 362 extensions::ResultCatcher result_catcher; | 366 extensions::ResultCatcher result_catcher; |
| 363 ui_test_utils::NavigateToURL( | 367 ui_test_utils::NavigateToURL( |
| 364 browser, extension->GetResourceURL(kTestExtensionTestPage)); | 368 browser, extension->GetResourceURL(kTestExtensionTestPage)); |
| 365 EXPECT_TRUE(result_catcher.GetNextResult()); | 369 EXPECT_TRUE(result_catcher.GetNextResult()); |
| 366 CloseBrowserSynchronously(browser); | 370 CloseBrowserSynchronously(browser); |
| 367 } | 371 } |
| 368 | 372 |
| 369 } // namespace policy | 373 } // namespace policy |
| OLD | NEW |