summaryrefslogtreecommitdiffstats
path: root/chrome/browser/translate
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-29 16:48:19 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-29 16:48:19 +0000
commit91c06e5e57d38760631ed240b1161a2af613b974 (patch)
treec24a23ab720050396179a46ddc4c64a4426dcbaa /chrome/browser/translate
parentc7fd73291df44ad9c03c04d8aba6e5d694bf2864 (diff)
downloadchromium_src-91c06e5e57d38760631ed240b1161a2af613b974.zip
chromium_src-91c06e5e57d38760631ed240b1161a2af613b974.tar.gz
chromium_src-91c06e5e57d38760631ed240b1161a2af613b974.tar.bz2
Add a scoper object for URLFetcher::Factory
This should make it much safer to use (i.e. memory-safe). BUG=90585 Review URL: http://codereview.chromium.org/7524033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94694 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/translate')
-rw-r--r--chrome/browser/translate/translate_manager_browsertest.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc
index 3ecc3ff..431f9d4 100644
--- a/chrome/browser/translate/translate_manager_browsertest.cc
+++ b/chrome/browser/translate/translate_manager_browsertest.cc
@@ -32,8 +32,8 @@
#include "content/common/notification_details.h"
#include "content/common/notification_observer_mock.h"
#include "content/common/notification_registrar.h"
-#include "content/common/test_url_fetcher_factory.h"
#include "content/common/view_messages.h"
+#include "content/test/test_url_fetcher_factory.h"
#include "grit/generated_resources.h"
#include "ipc/ipc_test_sink.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -147,8 +147,6 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness,
protected:
virtual void SetUp() {
- URLFetcher::set_factory(&url_fetcher_factory_);
-
// Access the TranslateManager singleton so it is created before we call
// RenderViewHostTestHarness::SetUp() to match what's done in Chrome, where
// the TranslateManager is created before the TabContents. This matters as
@@ -176,8 +174,6 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness,
Source<TabContentsWrapper>(contents_wrapper()));
TabContentsWrapperTestHarness::TearDown();
-
- URLFetcher::set_factory(NULL);
}
void SimulateTranslateScriptURLFetch(bool success) {