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

Side by Side Diff: chrome/browser/chromeos/gdata/gdata_file_system_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 <errno.h> 5 #include <errno.h>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 14 matching lines...) Expand all
25 #include "chrome/browser/chromeos/cros/cros_library.h" 25 #include "chrome/browser/chromeos/cros/cros_library.h"
26 #include "chrome/browser/chromeos/gdata/gdata.pb.h" 26 #include "chrome/browser/chromeos/gdata/gdata.pb.h"
27 #include "chrome/browser/chromeos/gdata/gdata_file_system.h" 27 #include "chrome/browser/chromeos/gdata/gdata_file_system.h"
28 #include "chrome/browser/chromeos/gdata/gdata_parser.h" 28 #include "chrome/browser/chromeos/gdata/gdata_parser.h"
29 #include "chrome/browser/chromeos/gdata/gdata_util.h" 29 #include "chrome/browser/chromeos/gdata/gdata_util.h"
30 #include "chrome/browser/chromeos/gdata/mock_directory_change_observer.h" 30 #include "chrome/browser/chromeos/gdata/mock_directory_change_observer.h"
31 #include "chrome/browser/chromeos/gdata/mock_gdata_documents_service.h" 31 #include "chrome/browser/chromeos/gdata/mock_gdata_documents_service.h"
32 #include "chrome/browser/chromeos/gdata/mock_gdata_sync_client.h" 32 #include "chrome/browser/chromeos/gdata/mock_gdata_sync_client.h"
33 #include "chrome/common/chrome_paths.h" 33 #include "chrome/common/chrome_paths.h"
34 #include "chrome/test/base/testing_profile.h" 34 #include "chrome/test/base/testing_profile.h"
35 #include "content/test/test_browser_thread.h"
36 #include "content/public/browser/browser_thread.h" 35 #include "content/public/browser/browser_thread.h"
36 #include "content/public/test/test_browser_thread.h"
37 #include "testing/gmock/include/gmock/gmock.h" 37 #include "testing/gmock/include/gmock/gmock.h"
38 #include "testing/gtest/include/gtest/gtest.h" 38 #include "testing/gtest/include/gtest/gtest.h"
39 39
40 using ::testing::AnyNumber; 40 using ::testing::AnyNumber;
41 using ::testing::AtLeast; 41 using ::testing::AtLeast;
42 using ::testing::Eq; 42 using ::testing::Eq;
43 using ::testing::IsNull; 43 using ::testing::IsNull;
44 using ::testing::Ne; 44 using ::testing::Ne;
45 using ::testing::NotNull; 45 using ::testing::NotNull;
46 using ::testing::Return; 46 using ::testing::Return;
(...skipping 3690 matching lines...) Expand 10 before | Expand all | Expand 10 after
3737 .Times(1); 3737 .Times(1);
3738 // We'll notify the directory change to the observer. 3738 // We'll notify the directory change to the observer.
3739 EXPECT_CALL(*mock_directory_observer_, 3739 EXPECT_CALL(*mock_directory_observer_,
3740 OnDirectoryChanged(Eq(FilePath(kGDataRootDirectory)))).Times(1); 3740 OnDirectoryChanged(Eq(FilePath(kGDataRootDirectory)))).Times(1);
3741 3741
3742 file_system_->RequestDirectoryRefresh(FilePath(kGDataRootDirectory)); 3742 file_system_->RequestDirectoryRefresh(FilePath(kGDataRootDirectory));
3743 message_loop_.RunAllPending(); 3743 message_loop_.RunAllPending();
3744 } 3744 }
3745 3745
3746 } // namespace gdata 3746 } // namespace gdata
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698