Index: extensions/browser/extension_warning_service_unittest.cc |
diff --git a/chrome/browser/extensions/extension_warning_service_unittest.cc b/extensions/browser/extension_warning_service_unittest.cc |
similarity index 80% |
rename from chrome/browser/extensions/extension_warning_service_unittest.cc |
rename to extensions/browser/extension_warning_service_unittest.cc |
index 7ad5b82b9c0459b9461c78687537f05b3d2fbc17..5c5b64352583824fc81cb1e489bae21838927a13 100644 |
--- a/chrome/browser/extensions/extension_warning_service_unittest.cc |
+++ b/extensions/browser/extension_warning_service_unittest.cc |
@@ -2,12 +2,10 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/extensions/extension_warning_service.h" |
+#include "extensions/browser/extension_warning_service.h" |
-#include "chrome/browser/profiles/profile.h" |
-#include "chrome/browser/ui/global_error/global_error_service.h" |
-#include "chrome/browser/ui/global_error/global_error_service_factory.h" |
-#include "chrome/test/base/testing_profile.h" |
+#include "content/public/test/test_browser_context.h" |
+#include "extensions/browser/extensions_test.h" |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -17,8 +15,8 @@ namespace { |
class TestExtensionWarningService : public ExtensionWarningService { |
public: |
- explicit TestExtensionWarningService(Profile* profile) |
- : ExtensionWarningService(profile) { |
+ explicit TestExtensionWarningService(content::BrowserContext* browser_context) |
+ : ExtensionWarningService(browser_context) { |
} |
virtual ~TestExtensionWarningService() {} |
@@ -35,6 +33,14 @@ class MockObserver : public ExtensionWarningService::Observer { |
MOCK_METHOD0(ExtensionWarningsChanged, void()); |
}; |
+class ExtensionWarningServiceTest : public ExtensionsTest { |
James Cook
2014/08/25 20:58:11
You could just say "typedef ExtensionsTest Extensi
Xi Han
2014/08/26 18:21:40
Done.
|
+ public: |
+ ExtensionWarningServiceTest() {} |
+ virtual ~ExtensionWarningServiceTest() {} |
+ private: |
+ DISALLOW_COPY_AND_ASSIGN(ExtensionWarningServiceTest); |
+}; |
+ |
const char* ext1_id = "extension1"; |
const char* ext2_id = "extension2"; |
const ExtensionWarning::WarningType warning_1 = |
@@ -46,9 +52,9 @@ const ExtensionWarning::WarningType warning_2 = |
// Check that inserting a warning triggers notifications, whereas inserting |
// the same warning again is silent. |
-TEST(ExtensionWarningServiceTest, SetWarning) { |
- TestingProfile profile; |
- TestExtensionWarningService warning_service(&profile); |
+TEST_F(ExtensionWarningServiceTest, SetWarning) { |
+ content::TestBrowserContext browser_context; |
+ TestExtensionWarningService warning_service(&browser_context); |
MockObserver observer; |
warning_service.AddObserver(&observer); |
@@ -68,9 +74,9 @@ TEST(ExtensionWarningServiceTest, SetWarning) { |
// Check that ClearWarnings deletes exactly the specified warnings and |
// triggers notifications where appropriate. |
-TEST(ExtensionWarningServiceTest, ClearWarnings) { |
- TestingProfile profile; |
- TestExtensionWarningService warning_service(&profile); |
+TEST_F(ExtensionWarningServiceTest, ClearWarnings) { |
+ content::TestBrowserContext browser_context; |
+ TestExtensionWarningService warning_service(&browser_context); |
MockObserver observer; |
warning_service.AddObserver(&observer); |