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

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

Issue 10500016: Move test_browser_thread.h from content\test to content\public\test. This way we can enforce that i… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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 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 // 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 10 matching lines...) Expand all
21 #include "base/utf_string_conversions.h" 21 #include "base/utf_string_conversions.h"
22 #include "chrome/browser/bookmarks/base_bookmark_model_observer.h" 22 #include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
23 #include "chrome/browser/bookmarks/bookmark_model.h" 23 #include "chrome/browser/bookmarks/bookmark_model.h"
24 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" 24 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"
25 #include "chrome/browser/sync/glue/bookmark_change_processor.h" 25 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
26 #include "chrome/browser/sync/glue/bookmark_model_associator.h" 26 #include "chrome/browser/sync/glue/bookmark_model_associator.h"
27 #include "chrome/browser/sync/glue/data_type_error_handler.h" 27 #include "chrome/browser/sync/glue/data_type_error_handler.h"
28 #include "chrome/browser/sync/glue/data_type_error_handler_mock.h" 28 #include "chrome/browser/sync/glue/data_type_error_handler_mock.h"
29 #include "chrome/common/chrome_switches.h" 29 #include "chrome/common/chrome_switches.h"
30 #include "chrome/test/base/testing_profile.h" 30 #include "chrome/test/base/testing_profile.h"
31 #include "content/test/test_browser_thread.h" 31 #include "content/public/test/test_browser_thread.h"
32 #include "sync/api/sync_error.h" 32 #include "sync/api/sync_error.h"
33 #include "sync/internal_api/change_record.h" 33 #include "sync/internal_api/change_record.h"
34 #include "sync/internal_api/read_node.h" 34 #include "sync/internal_api/read_node.h"
35 #include "sync/internal_api/read_transaction.h" 35 #include "sync/internal_api/read_transaction.h"
36 #include "sync/internal_api/test_user_share.h" 36 #include "sync/internal_api/test_user_share.h"
37 #include "sync/internal_api/write_node.h" 37 #include "sync/internal_api/write_node.h"
38 #include "sync/internal_api/write_transaction.h" 38 #include "sync/internal_api/write_transaction.h"
39 #include "sync/test/engine/test_id_factory.h" 39 #include "sync/test/engine/test_id_factory.h"
40 #include "testing/gmock/include/gmock/gmock.h" 40 #include "testing/gmock/include/gmock/gmock.h"
41 #include "testing/gtest/include/gtest/gtest.h" 41 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 1447 matching lines...) Expand 10 before | Expand all | Expand 10 after
1489 EXPECT_EQ(1, observer.get_started()); 1489 EXPECT_EQ(1, observer.get_started());
1490 EXPECT_EQ(0, observer.get_completed_count_at_started()); 1490 EXPECT_EQ(0, observer.get_completed_count_at_started());
1491 EXPECT_EQ(1, observer.get_completed()); 1491 EXPECT_EQ(1, observer.get_completed());
1492 1492
1493 model_->RemoveObserver(&observer); 1493 model_->RemoveObserver(&observer);
1494 } 1494 }
1495 1495
1496 } // namespace 1496 } // namespace
1497 1497
1498 } // namespace browser_sync 1498 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698