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

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

Issue 408003002: [Sync] Fix namespace for sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 5 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/bookmark_data_type_controller.h" 5 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 17 matching lines...) Expand all
28 #include "components/sync_driver/data_type_controller_mock.h" 28 #include "components/sync_driver/data_type_controller_mock.h"
29 #include "components/sync_driver/model_associator_mock.h" 29 #include "components/sync_driver/model_associator_mock.h"
30 #include "content/public/browser/browser_thread.h" 30 #include "content/public/browser/browser_thread.h"
31 #include "content/public/browser/notification_service.h" 31 #include "content/public/browser/notification_service.h"
32 #include "content/public/test/test_browser_thread_bundle.h" 32 #include "content/public/test/test_browser_thread_bundle.h"
33 #include "sync/api/sync_error.h" 33 #include "sync/api/sync_error.h"
34 #include "testing/gmock/include/gmock/gmock.h" 34 #include "testing/gmock/include/gmock/gmock.h"
35 #include "testing/gtest/include/gtest/gtest.h" 35 #include "testing/gtest/include/gtest/gtest.h"
36 36
37 using browser_sync::BookmarkDataTypeController; 37 using browser_sync::BookmarkDataTypeController;
38 using browser_sync::ChangeProcessorMock; 38 using sync_driver::ChangeProcessorMock;
39 using browser_sync::DataTypeController; 39 using sync_driver::DataTypeController;
40 using browser_sync::ModelAssociatorMock; 40 using sync_driver::ModelAssociatorMock;
41 using browser_sync::ModelLoadCallbackMock; 41 using sync_driver::ModelLoadCallbackMock;
42 using browser_sync::StartCallbackMock; 42 using sync_driver::StartCallbackMock;
43 using testing::_; 43 using testing::_;
44 using testing::DoAll; 44 using testing::DoAll;
45 using testing::InvokeWithoutArgs; 45 using testing::InvokeWithoutArgs;
46 using testing::Return; 46 using testing::Return;
47 using testing::SetArgumentPointee; 47 using testing::SetArgumentPointee;
48 48
49 namespace { 49 namespace {
50 50
51 class HistoryMock : public HistoryService { 51 class HistoryMock : public HistoryService {
52 public: 52 public:
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 WillOnce(InvokeWithoutArgs(bookmark_dtc_.get(), 346 WillOnce(InvokeWithoutArgs(bookmark_dtc_.get(),
347 &BookmarkDataTypeController::Stop)); 347 &BookmarkDataTypeController::Stop));
348 SetStopExpectations(); 348 SetStopExpectations();
349 349
350 EXPECT_CALL(start_callback_, Run(DataTypeController::OK, _, _)); 350 EXPECT_CALL(start_callback_, Run(DataTypeController::OK, _, _));
351 Start(); 351 Start();
352 // This should cause bookmark_dtc_->Stop() to be called. 352 // This should cause bookmark_dtc_->Stop() to be called.
353 bookmark_dtc_->OnSingleDatatypeUnrecoverableError(FROM_HERE, "Test"); 353 bookmark_dtc_->OnSingleDatatypeUnrecoverableError(FROM_HERE, "Test");
354 base::RunLoop().RunUntilIdle(); 354 base::RunLoop().RunUntilIdle();
355 } 355 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/bookmark_change_processor.cc ('k') | chrome/browser/sync/glue/bookmark_model_associator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698