| Index: chrome/browser/extensions/blacklist.h
|
| diff --git a/chrome/browser/extensions/blacklist.h b/chrome/browser/extensions/blacklist.h
|
| index c39214e7f394a77aeffa45c0dca1adad71b56ca8..5a4a454dcfc95ce94d4593b64a74dd39b9462c42 100644
|
| --- a/chrome/browser/extensions/blacklist.h
|
| +++ b/chrome/browser/extensions/blacklist.h
|
| @@ -53,12 +53,13 @@ class Blacklist : public KeyedService,
|
| class ScopedDatabaseManagerForTest {
|
| public:
|
| explicit ScopedDatabaseManagerForTest(
|
| - scoped_refptr<SafeBrowsingDatabaseManager> database_manager);
|
| + scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
|
| + database_manager);
|
|
|
| ~ScopedDatabaseManagerForTest();
|
|
|
| private:
|
| - scoped_refptr<SafeBrowsingDatabaseManager> original_;
|
| + scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> original_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ScopedDatabaseManagerForTest);
|
| };
|
| @@ -116,8 +117,10 @@ class Blacklist : public KeyedService,
|
| private:
|
| // Use via ScopedDatabaseManagerForTest.
|
| static void SetDatabaseManager(
|
| - scoped_refptr<SafeBrowsingDatabaseManager> database_manager);
|
| - static scoped_refptr<SafeBrowsingDatabaseManager> GetDatabaseManager();
|
| + scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
|
| + database_manager);
|
| + static scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
|
| + GetDatabaseManager();
|
|
|
| // content::NotificationObserver
|
| void Observe(int type,
|
|
|