summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-05 16:01:49 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-05 16:01:49 +0000
commit3b35564a393a641b95f4fd307d5b1b126b498e5a (patch)
treedf57140fbf8f5dd425f35bbd65a61795f3e0e084 /chrome/browser/extensions
parent210e33bb96f415629c4404b8b72199de80f3a33b (diff)
downloadchromium_src-3b35564a393a641b95f4fd307d5b1b126b498e5a.zip
chromium_src-3b35564a393a641b95f4fd307d5b1b126b498e5a.tar.gz
chromium_src-3b35564a393a641b95f4fd307d5b1b126b498e5a.tar.bz2
Wires TabContents to app extensions.
BUG=32845 TEST=none Review URL: http://codereview.chromium.org/566032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38212 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_browsertest.cc2
-rw-r--r--chrome/browser/extensions/extension_browsertest.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index f711fbd..252e2e6 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -30,8 +30,6 @@
// minimize false positives.
static const int kTimeoutMs = 60 * 1000; // 1 minute
-// Base class for extension browser tests. Provides utilities for loading,
-// unloading, and installing extensions.
void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) {
// This enables DOM automation for tab contentses.
EnableDOMAutomation();
diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h
index 7c116b5..65fb889 100644
--- a/chrome/browser/extensions/extension_browsertest.h
+++ b/chrome/browser/extensions/extension_browsertest.h
@@ -70,6 +70,8 @@ class ExtensionBrowserTest
bool loaded_;
bool installed_;
+
+ // test_data/extensions.
FilePath test_data_dir_;
std::string last_loaded_extension_id_;
int extension_installs_observed_;