summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r--chrome/browser/chromeos/gdata/gdata_sync_client.cc2
-rw-r--r--chrome/browser/chromeos/gdata/gdata_sync_client_unittest.cc2
2 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/gdata/gdata_sync_client.cc b/chrome/browser/chromeos/gdata/gdata_sync_client.cc
index 7316488..0bb7092 100644
--- a/chrome/browser/chromeos/gdata/gdata_sync_client.cc
+++ b/chrome/browser/chromeos/gdata/gdata_sync_client.cc
@@ -88,6 +88,8 @@ GDataSyncClient::GDataSyncClient(Profile* profile,
GDataSyncClient::~GDataSyncClient() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ if (file_system_)
+ file_system_->RemoveObserver(this);
if (cache_)
cache_->RemoveObserver(this);
diff --git a/chrome/browser/chromeos/gdata/gdata_sync_client_unittest.cc b/chrome/browser/chromeos/gdata/gdata_sync_client_unittest.cc
index a0fffc5..1c22009 100644
--- a/chrome/browser/chromeos/gdata/gdata_sync_client_unittest.cc
+++ b/chrome/browser/chromeos/gdata/gdata_sync_client_unittest.cc
@@ -78,6 +78,8 @@ class GDataSyncClientTest : public testing::Test {
EXPECT_CALL(*mock_network_library_, RemoveNetworkManagerObserver(
sync_client_.get())).Times(1);
EXPECT_CALL(*mock_file_system_, AddObserver(sync_client_.get())).Times(1);
+ EXPECT_CALL(*mock_file_system_,
+ RemoveObserver(sync_client_.get())).Times(1);
// Disable delaying so that DoSyncLoop() starts immediately.
sync_client_->set_delay_for_testing(base::TimeDelta::FromSeconds(0));