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

Side by Side Diff: chrome/browser/sync/glue/sync_backend_host_unittest.cc

Issue 10911073: NOT FOR COMMIT: Add DeviceInfo type and ChangeProcessor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes from review comments Created 8 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/glue/sync_backend_host.h" 5 #include "chrome/browser/sync/glue/sync_backend_host.h"
6 6
7 #include <cstddef> 7 #include <cstddef>
8 8
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 profile_.get(), 148 profile_.get(),
149 sync_prefs_->AsWeakPtr(), 149 sync_prefs_->AsWeakPtr(),
150 invalidator_storage_->AsWeakPtr())); 150 invalidator_storage_->AsWeakPtr()));
151 credentials_.email = "user@example.com"; 151 credentials_.email = "user@example.com";
152 credentials_.sync_token = "sync_token"; 152 credentials_.sync_token = "sync_token";
153 153
154 // NOTE: We can't include Passwords or Typed URLs due to the Sync Backend 154 // NOTE: We can't include Passwords or Typed URLs due to the Sync Backend
155 // Registrar removing them if it can't find their model workers. 155 // Registrar removing them if it can't find their model workers.
156 enabled_types_.Put(syncer::BOOKMARKS); 156 enabled_types_.Put(syncer::BOOKMARKS);
157 enabled_types_.Put(syncer::NIGORI); 157 enabled_types_.Put(syncer::NIGORI);
158 enabled_types_.Put(syncer::DEVICE_INFO);
158 enabled_types_.Put(syncer::PREFERENCES); 159 enabled_types_.Put(syncer::PREFERENCES);
159 enabled_types_.Put(syncer::SESSIONS); 160 enabled_types_.Put(syncer::SESSIONS);
160 enabled_types_.Put(syncer::SEARCH_ENGINES); 161 enabled_types_.Put(syncer::SEARCH_ENGINES);
161 enabled_types_.Put(syncer::AUTOFILL); 162 enabled_types_.Put(syncer::AUTOFILL);
162 } 163 }
163 164
164 virtual void TearDown() OVERRIDE { 165 virtual void TearDown() OVERRIDE {
165 if (backend_.get()) { 166 if (backend_.get()) {
166 backend_->StopSyncingForShutdown(); 167 backend_->StopSyncingForShutdown();
167 backend_->Shutdown(false); 168 backend_->Shutdown(false);
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 backend_->Shutdown(false); 629 backend_->Shutdown(false);
629 backend_.reset(); 630 backend_.reset();
630 631
631 TearDown(); 632 TearDown();
632 SetUp(); 633 SetUp();
633 } 634 }
634 635
635 } // namespace 636 } // namespace
636 637
637 } // namespace browser_sync 638 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698