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

Side by Side Diff: chrome/browser/sync_file_system/sync_file_system_service_unittest.cc

Issue 559063002: Remove webkit/browser/, point everything to storage/browser/ instead (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up DEPS per feedback Created 6 years, 3 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
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 <vector> 5 #include <vector>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/sync_file_system/sync_event_observer.h" 21 #include "chrome/browser/sync_file_system/sync_event_observer.h"
22 #include "chrome/browser/sync_file_system/sync_file_metadata.h" 22 #include "chrome/browser/sync_file_system/sync_file_metadata.h"
23 #include "chrome/browser/sync_file_system/sync_file_system_service.h" 23 #include "chrome/browser/sync_file_system/sync_file_system_service.h"
24 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" 24 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h"
25 #include "chrome/browser/sync_file_system/sync_status_code.h" 25 #include "chrome/browser/sync_file_system/sync_status_code.h"
26 #include "chrome/browser/sync_file_system/syncable_file_system_util.h" 26 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
27 #include "chrome/test/base/testing_profile.h" 27 #include "chrome/test/base/testing_profile.h"
28 #include "content/public/browser/browser_thread.h" 28 #include "content/public/browser/browser_thread.h"
29 #include "content/public/test/test_browser_thread_bundle.h" 29 #include "content/public/test/test_browser_thread_bundle.h"
30 #include "content/public/test/test_utils.h" 30 #include "content/public/test/test_utils.h"
31 #include "storage/browser/fileapi/file_system_context.h"
31 #include "testing/gtest/include/gtest/gtest.h" 32 #include "testing/gtest/include/gtest/gtest.h"
32 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h" 33 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"
33 #include "third_party/leveldatabase/src/include/leveldb/env.h" 34 #include "third_party/leveldatabase/src/include/leveldb/env.h"
34 #include "webkit/browser/fileapi/file_system_context.h"
35 35
36 using content::BrowserThread; 36 using content::BrowserThread;
37 using storage::FileSystemURL; 37 using storage::FileSystemURL;
38 using storage::FileSystemURLSet; 38 using storage::FileSystemURLSet;
39 using ::testing::AnyNumber; 39 using ::testing::AnyNumber;
40 using ::testing::AtLeast; 40 using ::testing::AtLeast;
41 using ::testing::InSequence; 41 using ::testing::InSequence;
42 using ::testing::InvokeWithoutArgs; 42 using ::testing::InvokeWithoutArgs;
43 using ::testing::Return; 43 using ::testing::Return;
44 using ::testing::StrictMock; 44 using ::testing::StrictMock;
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 base::Bind(&AssignValueAndQuit<SyncFileStatus>, 480 base::Bind(&AssignValueAndQuit<SyncFileStatus>,
481 &run_loop, &status, &sync_file_status)); 481 &run_loop, &status, &sync_file_status));
482 run_loop.Run(); 482 run_loop.Run();
483 483
484 EXPECT_EQ(SYNC_STATUS_OK, status); 484 EXPECT_EQ(SYNC_STATUS_OK, status);
485 EXPECT_EQ(SYNC_FILE_STATUS_HAS_PENDING_CHANGES, sync_file_status); 485 EXPECT_EQ(SYNC_FILE_STATUS_HAS_PENDING_CHANGES, sync_file_status);
486 } 486 }
487 } 487 }
488 488
489 } // namespace sync_file_system 489 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698