Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Side by Side Diff: chrome/browser/extensions/extension_browsertest.h

Issue 2769813004: Revert of Simplify ExtensionInstallChecker into a single-use class (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_EXTENSIONS_EXTENSION_BROWSERTEST_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_
6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_ 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 bool WaitForExtensionLoadError() { 256 bool WaitForExtensionLoadError() {
257 return observer_->WaitForExtensionLoadError(); 257 return observer_->WaitForExtensionLoadError();
258 } 258 }
259 259
260 // Wait for the specified extension to crash. Returns true if it really 260 // Wait for the specified extension to crash. Returns true if it really
261 // crashed. 261 // crashed.
262 bool WaitForExtensionCrash(const std::string& extension_id) { 262 bool WaitForExtensionCrash(const std::string& extension_id) {
263 return observer_->WaitForExtensionCrash(extension_id); 263 return observer_->WaitForExtensionCrash(extension_id);
264 } 264 }
265 265
266 // Wait for the crx installer to be done. Returns true if it has finished 266 // Wait for the crx installer to be done. Returns true if it really is done.
267 // successfully.
268 bool WaitForCrxInstallerDone() { 267 bool WaitForCrxInstallerDone() {
269 return observer_->WaitForCrxInstallerDone(); 268 return observer_->WaitForCrxInstallerDone();
270 } 269 }
271 270
272 // Wait for all extension views to load. 271 // Wait for all extension views to load.
273 bool WaitForExtensionViewsToLoad() { 272 bool WaitForExtensionViewsToLoad() {
274 return observer_->WaitForExtensionViewsToLoad(); 273 return observer_->WaitForExtensionViewsToLoad();
275 } 274 }
276 275
277 // Wait for the extension to be idle. 276 // Wait for the extension to be idle.
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 std::unique_ptr<extensions::ExtensionCacheFake> test_extension_cache_; 394 std::unique_ptr<extensions::ExtensionCacheFake> test_extension_cache_;
396 395
397 // An override so that chrome-extensions://<extension_id>/_test_resources/foo 396 // An override so that chrome-extensions://<extension_id>/_test_resources/foo
398 // maps to chrome/test/data/extensions/foo. 397 // maps to chrome/test/data/extensions/foo.
399 extensions::ExtensionProtocolTestHandler test_protocol_handler_; 398 extensions::ExtensionProtocolTestHandler test_protocol_handler_;
400 399
401 DISALLOW_COPY_AND_ASSIGN(ExtensionBrowserTest); 400 DISALLOW_COPY_AND_ASSIGN(ExtensionBrowserTest);
402 }; 401 };
403 402
404 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_ 403 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/crx_installer_browsertest.cc ('k') | chrome/browser/extensions/extension_install_checker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698