diff options
| author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
| commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
| tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /chrome/browser/extensions/extensions_service_unittest.h | |
| parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
| download | external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.zip external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.bz2 | |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'chrome/browser/extensions/extensions_service_unittest.h')
| -rw-r--r-- | chrome/browser/extensions/extensions_service_unittest.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extensions_service_unittest.h b/chrome/browser/extensions/extensions_service_unittest.h index fdb2ddd..fe298b4 100644 --- a/chrome/browser/extensions/extensions_service_unittest.h +++ b/chrome/browser/extensions/extensions_service_unittest.h @@ -4,6 +4,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSIONS_SERVICE_UNITTEST_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSIONS_SERVICE_UNITTEST_H_ +#pragma once #include "base/file_path.h" #include "base/message_loop.h" @@ -37,13 +38,13 @@ class ExtensionsServiceTestBase : public testing::Test { protected: ScopedTempDir temp_dir_; - scoped_ptr<PrefService> prefs_; scoped_ptr<Profile> profile_; FilePath extensions_install_dir_; scoped_refptr<ExtensionsService> service_; size_t total_successes_; MessageLoop loop_; ChromeThread ui_thread_; + ChromeThread db_thread_; ChromeThread webkit_thread_; ChromeThread file_thread_; ChromeThread io_thread_; |