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

Side by Side Diff: extensions/shell/test/shell_test.h

Issue 529293003: Extract ResultCatcher from ExtensionApiTest. Use it in ShellApiTest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: deprecate Created 6 years, 3 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
« no previous file with comments | « extensions/shell/test/shell_apitest.cc ('k') | extensions/shell/test/shell_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 EXTENSIONS_SHELL_TEST_SHELL_TEST_H_ 5 #ifndef EXTENSIONS_SHELL_TEST_SHELL_TEST_H_
6 #define EXTENSIONS_SHELL_TEST_SHELL_TEST_H_ 6 #define EXTENSIONS_SHELL_TEST_SHELL_TEST_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/public/test/browser_test.h" 9 #include "content/public/test/browser_test.h"
10 #include "content/public/test/browser_test_base.h" 10 #include "content/public/test/browser_test_base.h"
(...skipping 14 matching lines...) Expand all
25 class AppShellTest : public content::BrowserTestBase { 25 class AppShellTest : public content::BrowserTestBase {
26 public: 26 public:
27 AppShellTest(); 27 AppShellTest();
28 virtual ~AppShellTest(); 28 virtual ~AppShellTest();
29 29
30 // content::BrowserTestBase implementation. 30 // content::BrowserTestBase implementation.
31 virtual void SetUp() OVERRIDE; 31 virtual void SetUp() OVERRIDE;
32 virtual void SetUpOnMainThread() OVERRIDE; 32 virtual void SetUpOnMainThread() OVERRIDE;
33 virtual void RunTestOnMainThreadLoop() OVERRIDE; 33 virtual void RunTestOnMainThreadLoop() OVERRIDE;
34 34
35 // Loads an unpacked application from a directory using |extension_system_|
36 // and attempts to launch it. Returns true on success.
37 bool LoadAndLaunchApp(const base::FilePath& app_dir);
38
39 content::BrowserContext* browser_context() { return browser_context_; } 35 content::BrowserContext* browser_context() { return browser_context_; }
40 36
41 private: 37 protected:
42 content::BrowserContext* browser_context_; 38 content::BrowserContext* browser_context_;
43 ShellExtensionSystem* extension_system_; 39 ShellExtensionSystem* extension_system_;
44 }; 40 };
45 41
46 } // namespace extensions 42 } // namespace extensions
47 43
48 #endif // EXTENSIONS_SHELL_TEST_SHELL_TEST_H_ 44 #endif // EXTENSIONS_SHELL_TEST_SHELL_TEST_H_
OLDNEW
« no previous file with comments | « extensions/shell/test/shell_apitest.cc ('k') | extensions/shell/test/shell_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698