| Index: chrome/browser/prefs/pref_service_mock_builder.h
|
| diff --git a/chrome/browser/prefs/pref_service_mock_builder.h b/chrome/browser/prefs/pref_service_mock_builder.h
|
| index b8e32755bb197aa64e62203959975417f6920d78..d51f9696823b66945eab805764a28fe1cd0e38ad 100644
|
| --- a/chrome/browser/prefs/pref_service_mock_builder.h
|
| +++ b/chrome/browser/prefs/pref_service_mock_builder.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -7,7 +7,7 @@
|
| #pragma once
|
|
|
| #include "base/basictypes.h"
|
| -#include "base/scoped_ptr.h"
|
| +#include "base/ref_counted.h"
|
| #include "chrome/common/persistent_pref_store.h"
|
| #include "chrome/common/pref_store.h"
|
|
|
| @@ -55,12 +55,12 @@ class PrefServiceMockBuilder {
|
| PrefService* Create();
|
|
|
| private:
|
| - scoped_ptr<PrefStore> managed_platform_prefs_;
|
| - scoped_ptr<PrefStore> device_management_prefs_;
|
| - scoped_ptr<PrefStore> extension_prefs_;
|
| - scoped_ptr<PrefStore> command_line_prefs_;
|
| - scoped_ptr<PersistentPrefStore> user_prefs_;
|
| - scoped_ptr<PrefStore> recommended_prefs_;
|
| + scoped_refptr<PrefStore> managed_platform_prefs_;
|
| + scoped_refptr<PrefStore> device_management_prefs_;
|
| + scoped_refptr<PrefStore> extension_prefs_;
|
| + scoped_refptr<PrefStore> command_line_prefs_;
|
| + scoped_refptr<PersistentPrefStore> user_prefs_;
|
| + scoped_refptr<PrefStore> recommended_prefs_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PrefServiceMockBuilder);
|
| };
|
|
|