OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
379 | 379 |
380 // Our message loop may be used in tests which require it to be an IO loop. | 380 // Our message loop may be used in tests which require it to be an IO loop. |
381 ExtensionServiceTestBase::ExtensionServiceTestBase() | 381 ExtensionServiceTestBase::ExtensionServiceTestBase() |
382 : loop_(MessageLoop::TYPE_IO), | 382 : loop_(MessageLoop::TYPE_IO), |
383 service_(NULL), | 383 service_(NULL), |
384 expected_extensions_count_(0), | 384 expected_extensions_count_(0), |
385 ui_thread_(BrowserThread::UI, &loop_), | 385 ui_thread_(BrowserThread::UI, &loop_), |
386 db_thread_(BrowserThread::DB, &loop_), | 386 db_thread_(BrowserThread::DB, &loop_), |
387 webkit_thread_(BrowserThread::WEBKIT, &loop_), | 387 webkit_thread_(BrowserThread::WEBKIT, &loop_), |
388 file_thread_(BrowserThread::FILE, &loop_), | 388 file_thread_(BrowserThread::FILE, &loop_), |
| 389 file_user_blocking_thread_(BrowserThread::FILE_USER_BLOCKING, &loop_), |
389 io_thread_(BrowserThread::IO, &loop_) { | 390 io_thread_(BrowserThread::IO, &loop_) { |
390 FilePath test_data_dir; | 391 FilePath test_data_dir; |
391 if (!PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir)) { | 392 if (!PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir)) { |
392 ADD_FAILURE(); | 393 ADD_FAILURE(); |
393 return; | 394 return; |
394 } | 395 } |
395 data_dir_ = test_data_dir.AppendASCII("extensions"); | 396 data_dir_ = test_data_dir.AppendASCII("extensions"); |
396 } | 397 } |
397 | 398 |
398 ExtensionServiceTestBase::~ExtensionServiceTestBase() { | 399 ExtensionServiceTestBase::~ExtensionServiceTestBase() { |
(...skipping 3890 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4289 ASSERT_FALSE(AddPendingSyncInstall()); | 4290 ASSERT_FALSE(AddPendingSyncInstall()); |
4290 | 4291 |
4291 // Wait for the external source to install. | 4292 // Wait for the external source to install. |
4292 WaitForCrxInstall(crx_path_, INSTALL_NEW); | 4293 WaitForCrxInstall(crx_path_, INSTALL_NEW); |
4293 ASSERT_TRUE(IsCrxInstalled()); | 4294 ASSERT_TRUE(IsCrxInstalled()); |
4294 | 4295 |
4295 // Now that the extension is installed, sync request should fail | 4296 // Now that the extension is installed, sync request should fail |
4296 // because the extension is already installed. | 4297 // because the extension is already installed. |
4297 ASSERT_FALSE(AddPendingSyncInstall()); | 4298 ASSERT_FALSE(AddPendingSyncInstall()); |
4298 } | 4299 } |
OLD | NEW |