| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/memory/scoped_nsobject.h" | 5 #include "base/memory/scoped_nsobject.h" |
| 6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
| 7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
| 8 #include "chrome/browser/extensions/extension_pref_value_map.h" | 8 #include "chrome/browser/extensions/extension_pref_value_map.h" |
| 9 #include "chrome/browser/extensions/extension_prefs.h" | 9 #include "chrome/browser/extensions/extension_prefs.h" |
| 10 #include "chrome/browser/extensions/extension_process_manager.h" | 10 #include "chrome/browser/extensions/extension_process_manager.h" |
| 11 #include "chrome/browser/extensions/extension_service.h" | 11 #include "chrome/browser/extensions/extension_service.h" |
| 12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" | 13 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" |
| 14 #include "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" | 14 #include "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" |
| 15 #include "chrome/test/base/testing_profile.h" | 15 #include "chrome/test/base/testing_profile.h" |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 class ExtensionTestingProfile : public TestingProfile { | 19 class ExtensionTestingProfile : public TestingProfile { |
| 20 public: | 20 public: |
| 21 ExtensionTestingProfile() {} | 21 ExtensionTestingProfile() {} |
| 22 | 22 |
| 23 FilePath GetExtensionsInstallDir() { | 23 FilePath GetExtensionsInstallDir() { |
| 24 return GetPath().AppendASCII(ExtensionService::kInstallDirectoryName); | 24 return GetPath().AppendASCII(ExtensionService::kInstallDirectoryName); |
| 25 } | 25 } |
| 26 | 26 |
| 27 FilePath GetExtensionsSettingsDir() { | |
| 28 return GetPath().AppendASCII(ExtensionService::kSettingsDirectoryName); | |
| 29 } | |
| 30 | |
| 31 void InitExtensionProfile() { | 27 void InitExtensionProfile() { |
| 32 DCHECK(!GetExtensionProcessManager()); | 28 DCHECK(!GetExtensionProcessManager()); |
| 33 DCHECK(!GetExtensionService()); | 29 DCHECK(!GetExtensionService()); |
| 34 | 30 |
| 35 manager_.reset(ExtensionProcessManager::Create(this)); | 31 manager_.reset(ExtensionProcessManager::Create(this)); |
| 36 extension_pref_value_map_.reset(new ExtensionPrefValueMap); | 32 extension_pref_value_map_.reset(new ExtensionPrefValueMap); |
| 37 extension_prefs_.reset(new ExtensionPrefs(GetPrefs(), | 33 extension_prefs_.reset(new ExtensionPrefs(GetPrefs(), |
| 38 GetExtensionsInstallDir(), | 34 GetExtensionsInstallDir(), |
| 39 extension_pref_value_map_.get())); | 35 extension_pref_value_map_.get())); |
| 40 extension_prefs_->Init(false); | 36 extension_prefs_->Init(false); |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 }; | 94 }; |
| 99 | 95 |
| 100 TEST_F(ExtensionPopupControllerTest, DISABLED_Basics) { | 96 TEST_F(ExtensionPopupControllerTest, DISABLED_Basics) { |
| 101 // TODO(andybons): Better mechanisms for mocking out the extensions service | 97 // TODO(andybons): Better mechanisms for mocking out the extensions service |
| 102 // and extensions for easy testing need to be implemented. | 98 // and extensions for easy testing need to be implemented. |
| 103 // http://crbug.com/28316 | 99 // http://crbug.com/28316 |
| 104 EXPECT_TRUE([ExtensionPopupController popup]); | 100 EXPECT_TRUE([ExtensionPopupController popup]); |
| 105 } | 101 } |
| 106 | 102 |
| 107 } // namespace | 103 } // namespace |
| OLD | NEW |