Index: chrome/browser/google/google_url_tracker_unittest.cc |
diff --git a/chrome/browser/google/google_url_tracker_unittest.cc b/chrome/browser/google/google_url_tracker_unittest.cc |
index 9a1c8b536c40988ed3053367eb2c2b6acae63909..5ef262a835866b17a9dd07571feed66b5de7983c 100644 |
--- a/chrome/browser/google/google_url_tracker_unittest.cc |
+++ b/chrome/browser/google/google_url_tracker_unittest.cc |
@@ -11,7 +11,7 @@ |
#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" |
#include "chrome/common/chrome_notification_types.h" |
#include "chrome/common/pref_names.h" |
-#include "chrome/test/base/testing_browser_process_test.h" |
+#include "chrome/test/base/testing_browser_process.h" |
#include "chrome/test/base/testing_pref_service.h" |
#include "content/browser/browser_thread.h" |
#include "content/common/notification_service.h" |
@@ -100,7 +100,7 @@ InfoBarDelegate* CreateTestInfobar( |
// GoogleURLTrackerTest ------------------------------------------------------- |
-class GoogleURLTrackerTest : public TestingBrowserProcessTest { |
+class GoogleURLTrackerTest : public testing::Test { |
protected: |
GoogleURLTrackerTest(); |
virtual ~GoogleURLTrackerTest(); |
@@ -144,7 +144,7 @@ GoogleURLTrackerTest::GoogleURLTrackerTest() |
: observer_(new TestNotificationObserver), |
message_loop_(MessageLoop::TYPE_IO), |
io_thread_(BrowserThread::IO, &message_loop_), |
- local_state_(testing_browser_process_.get()) { |
+ local_state_(static_cast<TestingBrowserProcess*>(g_browser_process)) { |
} |
GoogleURLTrackerTest::~GoogleURLTrackerTest() { |
@@ -155,14 +155,16 @@ void GoogleURLTrackerTest::SetUp() { |
GoogleURLTracker* tracker = new GoogleURLTracker; |
tracker->queue_wakeup_task_ = false; |
MessageLoop::current()->RunAllPending(); |
- testing_browser_process_.get()->SetGoogleURLTracker(tracker); |
+ static_cast<TestingBrowserProcess*>(g_browser_process)->SetGoogleURLTracker( |
+ tracker); |
g_browser_process->google_url_tracker()->infobar_creator_ = |
&CreateTestInfobar; |
} |
void GoogleURLTrackerTest::TearDown() { |
- testing_browser_process_.get()->SetGoogleURLTracker(NULL); |
+ static_cast<TestingBrowserProcess*>(g_browser_process)->SetGoogleURLTracker( |
+ NULL); |
network_change_notifier_.reset(); |
} |