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

Side by Side Diff: chrome/browser/chromeos/gdata/drive_test_util.cc

Issue 10915226: OBSOLETE - Move drive.proto to browser/google_apis directory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 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 | 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/gdata/drive_test_util.h" 5 #include "chrome/browser/chromeos/gdata/drive_test_util.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/json/json_file_value_serializer.h" 8 #include "base/json/json_file_value_serializer.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/threading/sequenced_worker_pool.h" 11 #include "base/threading/sequenced_worker_pool.h"
12 #include "chrome/browser/chromeos/gdata/drive.pb.h"
13 #include "chrome/browser/chromeos/gdata/drive_api_parser.h" 12 #include "chrome/browser/chromeos/gdata/drive_api_parser.h"
14 #include "chrome/browser/chromeos/gdata/drive_file_system.h" 13 #include "chrome/browser/chromeos/gdata/drive_file_system.h"
14 #include "chrome/browser/google_apis/drive.pb.h"
15 #include "chrome/common/chrome_paths.h" 15 #include "chrome/common/chrome_paths.h"
16 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 18
19 namespace gdata { 19 namespace gdata {
20 namespace test_util { 20 namespace test_util {
21 21
22 // This class is used to monitor if any task is posted to a message loop. 22 // This class is used to monitor if any task is posted to a message loop.
23 class TaskObserver : public MessageLoop::TaskObserver { 23 class TaskObserver : public MessageLoop::TaskObserver {
24 public: 24 public:
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 GURL unused; 178 GURL unused;
179 DriveFileError file_error = file_system->UpdateFromFeedForTesting( 179 DriveFileError file_error = file_system->UpdateFromFeedForTesting(
180 feed_list, 180 feed_list,
181 start_changestamp, 181 start_changestamp,
182 root_feed_changestamp); 182 root_feed_changestamp);
183 ASSERT_EQ(DRIVE_FILE_OK, file_error); 183 ASSERT_EQ(DRIVE_FILE_OK, file_error);
184 } 184 }
185 185
186 } // namespace test_util 186 } // namespace test_util
187 } // namespace gdata 187 } // namespace gdata
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/gdata/drive_task_executor.cc ('k') | chrome/browser/chromeos/gdata/gdata_wapi_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698