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

Side by Side Diff: chrome/browser/extensions/test_extension_environment.h

Issue 14200028: Make CrosSettings and DeviceSettingsService non Lazy instances (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 8 months 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_ENVIRONMENT_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_ENVIRONMENT_H_
6 #define CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_ENVIRONMENT_H_ 6 #define CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_ENVIRONMENT_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "content/public/test/test_browser_thread.h" 10 #include "content/public/test/test_browser_thread.h"
11 11
12 #if defined(OS_WIN) 12 #if defined(OS_WIN)
13 #include "ui/base/win/scoped_ole_initializer.h" 13 #include "ui/base/win/scoped_ole_initializer.h"
14 #endif 14 #endif
15 15
16 #if defined(OS_CHROMEOS)
17 #include "chrome/browser/chromeos/settings/cros_settings.h"
18 #endif
19
16 class ExtensionService; 20 class ExtensionService;
17 class TestingProfile; 21 class TestingProfile;
18 22
19 namespace base { 23 namespace base {
20 class Value; 24 class Value;
21 } 25 }
22 26
23 namespace content { 27 namespace content {
24 class WebContents; 28 class WebContents;
25 } 29 }
(...skipping 27 matching lines...) Expand all
53 private: 57 private:
54 MessageLoopForUI loop_; 58 MessageLoopForUI loop_;
55 content::TestBrowserThread ui_thread_; 59 content::TestBrowserThread ui_thread_;
56 content::TestBrowserThread file_thread_; 60 content::TestBrowserThread file_thread_;
57 content::TestBrowserThread file_blocking_thread_; 61 content::TestBrowserThread file_blocking_thread_;
58 content::TestBrowserThread io_thread_; 62 content::TestBrowserThread io_thread_;
59 // We may need to add the rest of the browser threads here. This is 63 // We may need to add the rest of the browser threads here. This is
60 // likely to be indicated by memory leaks in which the object was 64 // likely to be indicated by memory leaks in which the object was
61 // expected to be freed by a DeleteSoon() call. 65 // expected to be freed by a DeleteSoon() call.
62 66
67 #if defined(OS_CHROMEOS)
68 // ExtensionService depends on UserManager which depends on CrosSettings.
69 chromeos::ScopedTestCrosSettings test_cros_settings_;
70 #endif
71
63 #if defined(OS_WIN) 72 #if defined(OS_WIN)
64 ui::ScopedOleInitializer ole_initializer_; 73 ui::ScopedOleInitializer ole_initializer_;
65 #endif 74 #endif
66 scoped_ptr<TestingProfile> profile_; 75 scoped_ptr<TestingProfile> profile_;
67 ExtensionService* extension_service_; 76 ExtensionService* extension_service_;
68 }; 77 };
69 78
70 } // namespace extensions 79 } // namespace extensions
71 80
72 #endif // CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_ENVIRONMENT_H_ 81 #endif // CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_ENVIRONMENT_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service_unittest.h ('k') | chrome/browser/extensions/test_extension_system.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698