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

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

Issue 5646003: Sanitize PrefStore interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix PrefService mock construction in PrefServiceTest to include command line store. 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"
(...skipping 16 matching lines...) Expand all
27 #include "chrome/browser/extensions/crx_installer.h" 27 #include "chrome/browser/extensions/crx_installer.h"
28 #include "chrome/browser/extensions/extension_creator.h" 28 #include "chrome/browser/extensions/extension_creator.h"
29 #include "chrome/browser/extensions/extension_error_reporter.h" 29 #include "chrome/browser/extensions/extension_error_reporter.h"
30 #include "chrome/browser/extensions/extensions_service.h" 30 #include "chrome/browser/extensions/extensions_service.h"
31 #include "chrome/browser/extensions/external_extension_provider.h" 31 #include "chrome/browser/extensions/external_extension_provider.h"
32 #include "chrome/browser/extensions/external_pref_extension_provider.h" 32 #include "chrome/browser/extensions/external_pref_extension_provider.h"
33 #include "chrome/browser/extensions/pack_extension_job.cc" 33 #include "chrome/browser/extensions/pack_extension_job.cc"
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_value_store.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"
44 #include "chrome/common/extensions/url_pattern.h" 44 #include "chrome/common/extensions/url_pattern.h"
45 #include "chrome/common/json_value_serializer.h" 45 #include "chrome/common/json_value_serializer.h"
46 #include "chrome/common/net/url_request_context_getter.h" 46 #include "chrome/common/net/url_request_context_getter.h"
47 #include "chrome/common/notification_registrar.h" 47 #include "chrome/common/notification_registrar.h"
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 // can be destroyed while BrowserThreads and MessageLoop are still around 345 // can be destroyed while BrowserThreads and MessageLoop are still around
346 // (they are used in the destruction process). 346 // (they are used in the destruction process).
347 service_ = NULL; 347 service_ = NULL;
348 profile_.reset(NULL); 348 profile_.reset(NULL);
349 MessageLoop::current()->RunAllPending(); 349 MessageLoop::current()->RunAllPending();
350 } 350 }
351 351
352 void ExtensionsServiceTestBase::InitializeExtensionsService( 352 void ExtensionsServiceTestBase::InitializeExtensionsService(
353 const FilePath& pref_file, const FilePath& extensions_install_dir) { 353 const FilePath& pref_file, const FilePath& extensions_install_dir) {
354 ExtensionTestingProfile* profile = new ExtensionTestingProfile(); 354 ExtensionTestingProfile* profile = new ExtensionTestingProfile();
355 // Create a preference service that only contains user defined 355 // Create a PrefService that only contains user defined preference values.
356 // preference values. 356 PrefService* prefs =
357 PrefService* prefs = PrefService::CreateUserPrefService(pref_file); 357 PrefServiceMockBuilder().WithUserFilePrefs(pref_file).Create();
358 Profile::RegisterUserPrefs(prefs); 358 Profile::RegisterUserPrefs(prefs);
359 browser::RegisterUserPrefs(prefs); 359 browser::RegisterUserPrefs(prefs);
360 profile->SetPrefService(prefs); 360 profile->SetPrefService(prefs);
361 361
362 profile_.reset(profile); 362 profile_.reset(profile);
363 363
364 service_ = profile->CreateExtensionsService( 364 service_ = profile->CreateExtensionsService(
365 CommandLine::ForCurrentProcess(), 365 CommandLine::ForCurrentProcess(),
366 extensions_install_dir); 366 extensions_install_dir);
367 service_->set_extensions_enabled(true); 367 service_->set_extensions_enabled(true);
(...skipping 2840 matching lines...) Expand 10 before | Expand all | Expand 10 after
3208 // Component extensions shouldn't get recourded in the prefs. 3208 // Component extensions shouldn't get recourded in the prefs.
3209 ValidatePrefKeyCount(0); 3209 ValidatePrefKeyCount(0);
3210 3210
3211 // Reload all extensions, and make sure it comes back. 3211 // Reload all extensions, and make sure it comes back.
3212 std::string extension_id = service_->extensions()->at(0)->id(); 3212 std::string extension_id = service_->extensions()->at(0)->id();
3213 loaded_.clear(); 3213 loaded_.clear();
3214 service_->ReloadExtensions(); 3214 service_->ReloadExtensions();
3215 ASSERT_EQ(1u, service_->extensions()->size()); 3215 ASSERT_EQ(1u, service_->extensions()->size());
3216 EXPECT_EQ(extension_id, service_->extensions()->at(0)->id()); 3216 EXPECT_EQ(extension_id, service_->extensions()->at(0)->id());
3217 } 3217 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_prefs.cc ('k') | chrome/browser/extensions/test_extension_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698