diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 10:39:42 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 10:39:42 +0000 |
| commit | 8329185f195615db8cbcb38c331802bc2a16aae4 (patch) | |
| tree | 1e9a0733ae394212fe62d92fd1fcc53ef8cc4da5 /chrome/browser/extensions/active_script_controller_browsertest.cc | |
| parent | e08341ed0a10027243a1b8ffc434fcb4d100dd81 (diff) | |
| download | chromium_src-8329185f195615db8cbcb38c331802bc2a16aae4.zip chromium_src-8329185f195615db8cbcb38c331802bc2a16aae4.tar.gz chromium_src-8329185f195615db8cbcb38c331802bc2a16aae4.tar.bz2 | |
Removed InProcessBrowserTest::CleanUpOnMainThread()
Changed all instances of superfluous InProcessBrowserTest::CleanUpOnMainThread()
API to use BrowserTestBase::TearDownOnMainThread() instead.
BUG=381181
TBR=rockot@chromium.org,sky@chromium.org,nkostylev@chromium.org
Review URL: https://codereview.chromium.org/366813007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285173 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/active_script_controller_browsertest.cc')
| -rw-r--r-- | chrome/browser/extensions/active_script_controller_browsertest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/active_script_controller_browsertest.cc b/chrome/browser/extensions/active_script_controller_browsertest.cc index aa7bab3..1bb934c 100644 --- a/chrome/browser/extensions/active_script_controller_browsertest.cc +++ b/chrome/browser/extensions/active_script_controller_browsertest.cc @@ -73,7 +73,7 @@ class ActiveScriptControllerBrowserTest : public ExtensionBrowserTest { ActiveScriptControllerBrowserTest() {} virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; - virtual void CleanUpOnMainThread() OVERRIDE; + virtual void TearDownOnMainThread() OVERRIDE; // Returns an extension with the given |host_type| and |injection_type|. If // one already exists, the existing extension will be returned. Othewrwise, @@ -96,7 +96,7 @@ void ActiveScriptControllerBrowserTest::SetUpCommandLine( command_line->AppendSwitch(switches::kEnableScriptsRequireAction); } -void ActiveScriptControllerBrowserTest::CleanUpOnMainThread() { +void ActiveScriptControllerBrowserTest::TearDownOnMainThread() { test_extension_dirs_.clear(); } |