Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(404)

Side by Side Diff: chrome/browser/extensions/extension_service_unittest.cc

Issue 8879013: Deprecate WEBKIT thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update after rebase Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 scoped_refptr<fileapi::FileSystemContext> file_system_context_; 380 scoped_refptr<fileapi::FileSystemContext> file_system_context_;
381 }; 381 };
382 382
383 // Our message loop may be used in tests which require it to be an IO loop. 383 // Our message loop may be used in tests which require it to be an IO loop.
384 ExtensionServiceTestBase::ExtensionServiceTestBase() 384 ExtensionServiceTestBase::ExtensionServiceTestBase()
385 : loop_(MessageLoop::TYPE_IO), 385 : loop_(MessageLoop::TYPE_IO),
386 service_(NULL), 386 service_(NULL),
387 expected_extensions_count_(0), 387 expected_extensions_count_(0),
388 ui_thread_(BrowserThread::UI, &loop_), 388 ui_thread_(BrowserThread::UI, &loop_),
389 db_thread_(BrowserThread::DB, &loop_), 389 db_thread_(BrowserThread::DB, &loop_),
390 webkit_thread_(BrowserThread::WEBKIT, &loop_), 390 webkit_thread_(BrowserThread::WEBKIT_DEPRECATED, &loop_),
391 file_thread_(BrowserThread::FILE, &loop_), 391 file_thread_(BrowserThread::FILE, &loop_),
392 file_user_blocking_thread_(BrowserThread::FILE_USER_BLOCKING, &loop_), 392 file_user_blocking_thread_(BrowserThread::FILE_USER_BLOCKING, &loop_),
393 io_thread_(BrowserThread::IO, &loop_) { 393 io_thread_(BrowserThread::IO, &loop_) {
394 FilePath test_data_dir; 394 FilePath test_data_dir;
395 if (!PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir)) { 395 if (!PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir)) {
396 ADD_FAILURE(); 396 ADD_FAILURE();
397 return; 397 return;
398 } 398 }
399 data_dir_ = test_data_dir.AppendASCII("extensions"); 399 data_dir_ = test_data_dir.AppendASCII("extensions");
400 } 400 }
(...skipping 3899 matching lines...) Expand 10 before | Expand all | Expand 10 after
4300 ASSERT_FALSE(AddPendingSyncInstall()); 4300 ASSERT_FALSE(AddPendingSyncInstall());
4301 4301
4302 // Wait for the external source to install. 4302 // Wait for the external source to install.
4303 WaitForCrxInstall(crx_path_, INSTALL_NEW); 4303 WaitForCrxInstall(crx_path_, INSTALL_NEW);
4304 ASSERT_TRUE(IsCrxInstalled()); 4304 ASSERT_TRUE(IsCrxInstalled());
4305 4305
4306 // Now that the extension is installed, sync request should fail 4306 // Now that the extension is installed, sync request should fail
4307 // because the extension is already installed. 4307 // because the extension is already installed.
4308 ASSERT_FALSE(AddPendingSyncInstall()); 4308 ASSERT_FALSE(AddPendingSyncInstall());
4309 } 4309 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_data_deleter.cc ('k') | chrome/browser/metrics/thread_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698