Index: extensions/browser/extensions_test.h |
diff --git a/extensions/browser/extensions_test.h b/extensions/browser/extensions_test.h |
index a8ab790cf122c5f69ec25f3a928d7f3ce460c2b8..260a168d981ae2a999b9747cd01ad62bcac598cb 100644 |
--- a/extensions/browser/extensions_test.h |
+++ b/extensions/browser/extensions_test.h |
@@ -11,9 +11,9 @@ |
#include "testing/gtest/include/gtest/gtest.h" |
namespace content { |
+class BrowserContext; |
class ContentClient; |
class ContentBrowserClient; |
-class TestBrowserContext; |
} |
namespace extensions { |
@@ -32,9 +32,12 @@ class ExtensionsTest : public testing::Test { |
ExtensionsTest(); |
virtual ~ExtensionsTest(); |
- content::TestBrowserContext* browser_context() { |
- return browser_context_.get(); |
- } |
+ // Returned as a BrowserContext since most users don't need methods from |
James Cook
2014/09/09 00:05:39
I've found as I moved tests around that I frequent
Yoyo Zhou
2014/09/09 00:43:40
vs. extensions_browser_client, you mean? Yes, I ag
|
+ // TestBrowserContext. |
+ content::BrowserContext* browser_context() { return browser_context_.get(); } |
+ |
+ // Returned as a TestExtensionsBrowserClient since most users need to call |
+ // test-specific methods on it. |
TestExtensionsBrowserClient* extensions_browser_client() { |
return extensions_browser_client_.get(); |
} |
@@ -46,7 +49,7 @@ class ExtensionsTest : public testing::Test { |
private: |
scoped_ptr<content::ContentClient> content_client_; |
scoped_ptr<content::ContentBrowserClient> content_browser_client_; |
- scoped_ptr<content::TestBrowserContext> browser_context_; |
+ scoped_ptr<content::BrowserContext> browser_context_; |
scoped_ptr<TestExtensionsBrowserClient> extensions_browser_client_; |
DISALLOW_COPY_AND_ASSIGN(ExtensionsTest); |