OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_ | 5 #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_ |
6 #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_ | 6 #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_ |
7 | 7 |
8 #include "chrome/browser/extensions/extension_test_notification_observer.h" | 8 #include "chrome/browser/extensions/extension_test_notification_observer.h" |
9 #include "chrome/test/base/web_ui_browsertest.h" | 9 #include "chrome/test/base/web_ui_browsertest.h" |
10 #include "extensions/common/extension.h" | 10 #include "extensions/common/extension.h" |
(...skipping 10 matching lines...) Expand all Loading... | |
21 // Get the profile to use. | 21 // Get the profile to use. |
22 Profile* GetProfile(); | 22 Profile* GetProfile(); |
23 | 23 |
24 const std::string& last_loaded_extension_id() { | 24 const std::string& last_loaded_extension_id() { |
25 return observer_->last_loaded_extension_id(); | 25 return observer_->last_loaded_extension_id(); |
26 } | 26 } |
27 | 27 |
28 virtual void SetUpOnMainThread() OVERRIDE; | 28 virtual void SetUpOnMainThread() OVERRIDE; |
29 | 29 |
30 void InstallGoodExtension(); | 30 void InstallGoodExtension(); |
31 const extensions::Extension* InstallExtension(const base::FilePath& path); | |
31 | 32 |
32 private: | 33 private: |
33 bool WaitForExtensionViewsToLoad(); | 34 bool WaitForExtensionViewsToLoad(); |
34 const extensions::Extension* LoadUnpackedExtension( | 35 const extensions::Extension* LoadUnpackedExtension( |
35 const base::FilePath& path); | 36 const base::FilePath& path); |
36 const extensions::Extension* InstallExtension(const base::FilePath& path); | 37 // const extensions::Extension* InstallExtension(const base::FilePath& path); |
pfeldman
2014/03/26 09:18:45
Please revert.
| |
37 | 38 |
38 scoped_ptr<ExtensionTestNotificationObserver> observer_; | 39 scoped_ptr<ExtensionTestNotificationObserver> observer_; |
39 | 40 |
40 // The default profile to be used. | 41 // The default profile to be used. |
41 Profile* profile_; | 42 Profile* profile_; |
42 | 43 |
43 DISALLOW_COPY_AND_ASSIGN(ExtensionSettingsUIBrowserTest); | 44 DISALLOW_COPY_AND_ASSIGN(ExtensionSettingsUIBrowserTest); |
44 }; | 45 }; |
45 | 46 |
46 #endif // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_ | 47 #endif // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_ |
OLD | NEW |