summaryrefslogtreecommitdiffstats
path: root/chrome/test/chrome_plugin
diff options
context:
space:
mode:
authordeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-09 11:40:58 +0000
committerdeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-09 11:40:58 +0000
commitde2eaa7a14779eeced44d006c067f359af4e0503 (patch)
tree0ed8afaf77e20a522847659f7b8780bf0dd725ff /chrome/test/chrome_plugin
parentcccd51abcce7ceb09a46278283698461273f08c3 (diff)
downloadchromium_src-de2eaa7a14779eeced44d006c067f359af4e0503.zip
chromium_src-de2eaa7a14779eeced44d006c067f359af4e0503.tar.gz
chromium_src-de2eaa7a14779eeced44d006c067f359af4e0503.tar.bz2
Add an AtExitManager to test_chrome_plugin. It uses Time::Now(), which now uses a Singleton.
Review URL: http://codereview.chromium.org/1843 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1895 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/chrome_plugin')
-rw-r--r--chrome/test/chrome_plugin/test_chrome_plugin.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/test/chrome_plugin/test_chrome_plugin.cc b/chrome/test/chrome_plugin/test_chrome_plugin.cc
index ff44f8d..5e3c532 100644
--- a/chrome/test/chrome_plugin/test_chrome_plugin.cc
+++ b/chrome/test/chrome_plugin/test_chrome_plugin.cc
@@ -4,6 +4,7 @@
#include "chrome/test/chrome_plugin/test_chrome_plugin.h"
+#include "base/at_exit.h"
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/message_loop.h"
@@ -17,6 +18,10 @@ static CPRequestFuncs g_cprequest_funcs;
static CPResponseFuncs g_cpresponse_funcs;
static TestFuncParams::BrowserFuncs g_cptest_funcs;
+// Create a global AtExitManager so that our code can use code from base that
+// uses Singletons, for example. We don't care about static constructors here.
+static base::AtExitManager global_at_exit_manager;
+
const TestResponsePayload* FindPayload(const char* url) {
for (int i = 0; i < arraysize(kChromeTestPluginPayloads); ++i) {
if (strcmp(kChromeTestPluginPayloads[i].url, url) == 0)