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

Side by Side Diff: chrome/browser/sync/profile_sync_service_bookmark_unittest.cc

Issue 8818004: Revert 113112 - Revert 113103 - Changes the visibility of the 'mobile' node based on whether ther... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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
« no previous file with comments | « chrome/browser/sync/glue/bookmark_model_associator.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 // TODO(akalin): This file is basically just a unit test for 5 // TODO(akalin): This file is basically just a unit test for
6 // BookmarkChangeProcessor. Write unit tests for 6 // BookmarkChangeProcessor. Write unit tests for
7 // BookmarkModelAssociator separately. 7 // BookmarkModelAssociator separately.
8 8
9 #include <stack> 9 #include <stack>
10 #include <vector> 10 #include <vector>
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 model_(NULL) { 289 model_(NULL) {
290 } 290 }
291 291
292 virtual ~ProfileSyncServiceBookmarkTest() { 292 virtual ~ProfileSyncServiceBookmarkTest() {
293 StopSync(); 293 StopSync();
294 UnloadBookmarkModel(); 294 UnloadBookmarkModel();
295 } 295 }
296 296
297 virtual void SetUp() { 297 virtual void SetUp() {
298 test_user_share_.SetUp(); 298 test_user_share_.SetUp();
299 CommandLine::ForCurrentProcess()->AppendSwitch(
300 switches::kCreateMobileBookmarksFolder);
299 } 301 }
300 302
301 virtual void TearDown() { 303 virtual void TearDown() {
302 test_user_share_.TearDown(); 304 test_user_share_.TearDown();
303 } 305 }
304 306
305 // Load (or re-load) the bookmark model. |load| controls use of the 307 // Load (or re-load) the bookmark model. |load| controls use of the
306 // bookmarks file on disk. |save| controls whether the newly loaded 308 // bookmarks file on disk. |save| controls whether the newly loaded
307 // bookmark model will write out a bookmark file as it goes. 309 // bookmark model will write out a bookmark file as it goes.
308 void LoadBookmarkModel(LoadOption load, SaveOption save) { 310 void LoadBookmarkModel(LoadOption load, SaveOption save) {
(...skipping 1118 matching lines...) Expand 10 before | Expand all | Expand 10 after
1427 // Make sure we're back in sync. In real life, the user would need 1429 // Make sure we're back in sync. In real life, the user would need
1428 // to reauthenticate before this happens, but in the test, authentication 1430 // to reauthenticate before this happens, but in the test, authentication
1429 // is sidestepped. 1431 // is sidestepped.
1430 ExpectBookmarkModelMatchesTestData(); 1432 ExpectBookmarkModelMatchesTestData();
1431 ExpectModelMatch(); 1433 ExpectModelMatch();
1432 } 1434 }
1433 1435
1434 } // namespace 1436 } // namespace
1435 1437
1436 } // namespace browser_sync 1438 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/bookmark_model_associator.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698