Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1894)

Unified Diff: chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc

Issue 289283015: Extract touchscreen device management into a generic manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc
diff --git a/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc b/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc
index 74adf5239b36a7d80af9b238b6010361d6303487..a2587ca4cfffe3269aabf5c90687497b4c14c9db 100644
--- a/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc
+++ b/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/sync/sessions/sessions_sync_manager.h"
+#include "base/at_exit.h"
#include "base/strings/string_util.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/sessions/session_id.h"
@@ -234,6 +235,7 @@ class SessionsSyncManagerTest
SessionsSyncManagerTest() : test_processor_(NULL) {}
virtual void SetUp() OVERRIDE {
+ at_exit_.reset(new base::ShadowingAtExitManager());
BrowserWithTestWindowTest::SetUp();
browser_sync::NotificationServiceSessionsRouter* router(
new browser_sync::NotificationServiceSessionsRouter(
@@ -247,6 +249,7 @@ class SessionsSyncManagerTest
helper()->Reset();
manager_.reset();
BrowserWithTestWindowTest::TearDown();
+ at_exit_.reset();
}
virtual scoped_ptr<DeviceInfo> GetLocalDeviceInfo() const OVERRIDE {
@@ -310,6 +313,7 @@ class SessionsSyncManagerTest
}
private:
+ scoped_ptr<base::ShadowingAtExitManager> at_exit_;
scoped_ptr<SessionsSyncManager> manager_;
SessionSyncTestHelper helper_;
TestSyncProcessorStub* test_processor_;

Powered by Google App Engine
This is Rietveld 408576698