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

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

Issue 5633008: Remove BrowserFileSystemContext class (merge into SandboxedFSContext) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 10 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/extensions_service_unittest.h" 5 #include "chrome/browser/extensions/extensions_service_unittest.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/file_util.h" 12 #include "base/file_util.h"
13 #include "base/json/json_reader.h" 13 #include "base/json/json_reader.h"
14 #include "base/message_loop.h" 14 #include "base/message_loop.h"
15 #include "base/path_service.h" 15 #include "base/path_service.h"
16 #include "base/scoped_ptr.h" 16 #include "base/scoped_ptr.h"
17 #include "base/stl_util-inl.h" 17 #include "base/stl_util-inl.h"
18 #include "base/string16.h" 18 #include "base/string16.h"
19 #include "base/string_number_conversions.h" 19 #include "base/string_number_conversions.h"
20 #include "base/string_util.h" 20 #include "base/string_util.h"
21 #include "base/task.h" 21 #include "base/task.h"
22 #include "base/utf_string_conversions.h" 22 #include "base/utf_string_conversions.h"
23 #include "base/version.h" 23 #include "base/version.h"
24 #include "chrome/browser/appcache/chrome_appcache_service.h" 24 #include "chrome/browser/appcache/chrome_appcache_service.h"
25 #include "chrome/browser/browser_thread.h" 25 #include "chrome/browser/browser_thread.h"
26 #include "chrome/browser/file_system/browser_file_system_context.h"
27 #include "chrome/browser/extensions/crx_installer.h" 26 #include "chrome/browser/extensions/crx_installer.h"
28 #include "chrome/browser/extensions/extension_creator.h" 27 #include "chrome/browser/extensions/extension_creator.h"
29 #include "chrome/browser/extensions/extension_error_reporter.h" 28 #include "chrome/browser/extensions/extension_error_reporter.h"
30 #include "chrome/browser/extensions/extensions_service.h" 29 #include "chrome/browser/extensions/extensions_service.h"
31 #include "chrome/browser/extensions/external_extension_provider.h" 30 #include "chrome/browser/extensions/external_extension_provider.h"
32 #include "chrome/browser/extensions/external_pref_extension_provider.h" 31 #include "chrome/browser/extensions/external_pref_extension_provider.h"
33 #include "chrome/browser/extensions/pack_extension_job.cc" 32 #include "chrome/browser/extensions/pack_extension_job.cc"
33 #include "chrome/browser/file_system/browser_file_system_helper.h"
34 #include "chrome/browser/in_process_webkit/dom_storage_context.h" 34 #include "chrome/browser/in_process_webkit/dom_storage_context.h"
35 #include "chrome/browser/in_process_webkit/webkit_context.h" 35 #include "chrome/browser/in_process_webkit/webkit_context.h"
36 #include "chrome/browser/prefs/browser_prefs.h" 36 #include "chrome/browser/prefs/browser_prefs.h"
37 #include "chrome/browser/prefs/pref_service_mock_builder.h" 37 #include "chrome/browser/prefs/pref_service_mock_builder.h"
38 #include "chrome/browser/prefs/scoped_pref_update.h" 38 #include "chrome/browser/prefs/scoped_pref_update.h"
39 #include "chrome/common/chrome_paths.h" 39 #include "chrome/common/chrome_paths.h"
40 #include "chrome/common/chrome_switches.h" 40 #include "chrome/common/chrome_switches.h"
41 #include "chrome/common/extensions/extension.h" 41 #include "chrome/common/extensions/extension.h"
42 #include "chrome/common/extensions/extension_constants.h" 42 #include "chrome/common/extensions/extension_constants.h"
43 #include "chrome/common/extensions/extension_resource.h" 43 #include "chrome/common/extensions/extension_resource.h"
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 BrowserThread::PostTask( 309 BrowserThread::PostTask(
310 BrowserThread::IO, FROM_HERE, 310 BrowserThread::IO, FROM_HERE,
311 NewRunnableMethod(appcache_service_.get(), 311 NewRunnableMethod(appcache_service_.get(),
312 &ChromeAppCacheService::InitializeOnIOThread, 312 &ChromeAppCacheService::InitializeOnIOThread,
313 GetPath(), IsOffTheRecord(), 313 GetPath(), IsOffTheRecord(),
314 make_scoped_refptr(GetHostContentSettingsMap()))); 314 make_scoped_refptr(GetHostContentSettingsMap())));
315 } 315 }
316 return appcache_service_; 316 return appcache_service_;
317 } 317 }
318 318
319 virtual BrowserFileSystemContext* GetFileSystemContext() { 319 virtual fileapi::SandboxedFileSystemContext* GetFileSystemContext() {
320 if (!browser_file_system_context_) 320 if (!file_system_context_)
321 browser_file_system_context_ = new BrowserFileSystemContext( 321 file_system_context_ = CreateFileSystemContext(
322 GetPath(), IsOffTheRecord()); 322 GetPath(), IsOffTheRecord());
323 return browser_file_system_context_; 323 return file_system_context_;
324 } 324 }
325 325
326 private: 326 private:
327 ExtensionsService* service_; 327 ExtensionsService* service_;
328 scoped_refptr<ChromeAppCacheService> appcache_service_; 328 scoped_refptr<ChromeAppCacheService> appcache_service_;
329 scoped_refptr<BrowserFileSystemContext> browser_file_system_context_; 329 scoped_refptr<fileapi::SandboxedFileSystemContext> file_system_context_;
330 }; 330 };
331 331
332 // Our message loop may be used in tests which require it to be an IO loop. 332 // Our message loop may be used in tests which require it to be an IO loop.
333 ExtensionsServiceTestBase::ExtensionsServiceTestBase() 333 ExtensionsServiceTestBase::ExtensionsServiceTestBase()
334 : total_successes_(0), 334 : total_successes_(0),
335 loop_(MessageLoop::TYPE_IO), 335 loop_(MessageLoop::TYPE_IO),
336 ui_thread_(BrowserThread::UI, &loop_), 336 ui_thread_(BrowserThread::UI, &loop_),
337 db_thread_(BrowserThread::DB, &loop_), 337 db_thread_(BrowserThread::DB, &loop_),
338 webkit_thread_(BrowserThread::WEBKIT, &loop_), 338 webkit_thread_(BrowserThread::WEBKIT, &loop_),
339 file_thread_(BrowserThread::FILE, &loop_), 339 file_thread_(BrowserThread::FILE, &loop_),
(...skipping 2905 matching lines...) Expand 10 before | Expand all | Expand 10 after
3245 // Component extensions shouldn't get recourded in the prefs. 3245 // Component extensions shouldn't get recourded in the prefs.
3246 ValidatePrefKeyCount(0); 3246 ValidatePrefKeyCount(0);
3247 3247
3248 // Reload all extensions, and make sure it comes back. 3248 // Reload all extensions, and make sure it comes back.
3249 std::string extension_id = service_->extensions()->at(0)->id(); 3249 std::string extension_id = service_->extensions()->at(0)->id();
3250 loaded_.clear(); 3250 loaded_.clear();
3251 service_->ReloadExtensions(); 3251 service_->ReloadExtensions();
3252 ASSERT_EQ(1u, service_->extensions()->size()); 3252 ASSERT_EQ(1u, service_->extensions()->size());
3253 EXPECT_EQ(extension_id, service_->extensions()->at(0)->id()); 3253 EXPECT_EQ(extension_id, service_->extensions()->at(0)->id());
3254 } 3254 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extensions_service.cc ('k') | chrome/browser/file_system/browser_file_system_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698