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

Side by Side Diff: chrome/browser/chromeos/drive/drive_scheduler_unittest.cc

Issue 11360108: Start calculating new combined NetworkChangeNotifier signal (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address szym's first round of comments Created 8 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
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/chromeos/drive/drive_scheduler.h" 5 #include "chrome/browser/chromeos/drive/drive_scheduler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/threading/sequenced_worker_pool.h" 8 #include "base/threading/sequenced_worker_pool.h"
9 #include "chrome/browser/chromeos/drive/drive_test_util.h" 9 #include "chrome/browser/chromeos/drive/drive_test_util.h"
10 #include "chrome/browser/chromeos/drive/file_system/drive_operations.h" 10 #include "chrome/browser/chromeos/drive/file_system/drive_operations.h"
(...skipping 10 matching lines...) Expand all
21 using ::testing::AnyNumber; 21 using ::testing::AnyNumber;
22 using ::testing::DoAll; 22 using ::testing::DoAll;
23 using ::testing::Return; 23 using ::testing::Return;
24 using ::testing::StrictMock; 24 using ::testing::StrictMock;
25 using ::testing::_; 25 using ::testing::_;
26 26
27 namespace drive { 27 namespace drive {
28 28
29 namespace { 29 namespace {
30 30
31 class MockNetworkChangeNotifier : public net::NetworkChangeNotifier { 31 class MockNetworkChangeNotifier : public net::NetworkChangeNotifier {
szym 2012/11/27 22:22:05 If you are going to change anything here, I sugges
32 public: 32 public:
33 MockNetworkChangeNotifier()
34 : net::NetworkChangeNotifier(
35 net:NetworkChangeNotifier::NetworkChangeCalculatorParams()) {
36 }
37
33 MOCK_CONST_METHOD0(GetCurrentConnectionType, 38 MOCK_CONST_METHOD0(GetCurrentConnectionType,
34 net::NetworkChangeNotifier::ConnectionType()); 39 net::NetworkChangeNotifier::ConnectionType());
35 }; 40 };
36 41
37 class MockCopyOperation : public file_system::CopyOperation { 42 class MockCopyOperation : public file_system::CopyOperation {
38 public: 43 public:
39 MockCopyOperation() 44 MockCopyOperation()
40 : file_system::CopyOperation(NULL, NULL, NULL, NULL, NULL, NULL) { 45 : file_system::CopyOperation(NULL, NULL, NULL, NULL, NULL, NULL) {
41 } 46 }
42 47
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 404
400 FilePath file_in_root(FILE_PATH_LITERAL("drive/File 1.txt")); 405 FilePath file_in_root(FILE_PATH_LITERAL("drive/File 1.txt"));
401 DriveFileError error; 406 DriveFileError error;
402 scheduler_->Remove( 407 scheduler_->Remove(
403 file_in_root, false, 408 file_in_root, false,
404 base::Bind(&test_util::CopyErrorCodeFromFileOperationCallback, &error)); 409 base::Bind(&test_util::CopyErrorCodeFromFileOperationCallback, &error));
405 google_apis::test_util::RunBlockingPoolTask(); 410 google_apis::test_util::RunBlockingPoolTask();
406 } 411 }
407 412
408 } // namespace drive 413 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698