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

Side by Side Diff: chrome/browser/sync/glue/model_association_manager_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 #include "base/callback.h" 5 #include "base/callback.h"
6 #include "base/message_loop.h" 6 #include "base/message_loop.h"
7 #include "chrome/browser/sync/glue/fake_data_type_controller.h" 7 #include "chrome/browser/sync/glue/fake_data_type_controller.h"
8 #include "chrome/browser/sync/glue/model_association_manager.h" 8 #include "chrome/browser/sync/glue/model_association_manager.h"
9 #include "content/test/test_browser_thread.h" 9 #include "content/public/test/test_browser_thread.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 using ::testing::_; 13 using ::testing::_;
14 namespace browser_sync { 14 namespace browser_sync {
15 class MockModelAssociationResultProcessor : 15 class MockModelAssociationResultProcessor :
16 public ModelAssociationResultProcessor { 16 public ModelAssociationResultProcessor {
17 public: 17 public:
18 MockModelAssociationResultProcessor() {} 18 MockModelAssociationResultProcessor() {}
19 ~MockModelAssociationResultProcessor() {} 19 ~MockModelAssociationResultProcessor() {}
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 GetController(controllers_, 275 GetController(controllers_,
276 syncable::BOOKMARKS)->SimulateModelLoadFinishing(); 276 syncable::BOOKMARKS)->SimulateModelLoadFinishing();
277 277
278 GetController(controllers_, syncable::BOOKMARKS)->FinishStart( 278 GetController(controllers_, syncable::BOOKMARKS)->FinishStart(
279 DataTypeController::OK); 279 DataTypeController::OK);
280 } 280 }
281 281
282 282
283 } // namespace browser_sync 283 } // namespace browser_sync
284 284
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698