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

Side by Side Diff: chrome/browser/chromeos/gdata/drive_resource_metadata_unittest.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_resource_metadata.h" 5 #include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/sequenced_task_runner.h" 12 #include "base/sequenced_task_runner.h"
13 #include "base/string_number_conversions.h" 13 #include "base/string_number_conversions.h"
14 #include "base/threading/sequenced_worker_pool.h" 14 #include "base/threading/sequenced_worker_pool.h"
15 #include "base/message_loop.h" 15 #include "base/message_loop.h"
16 #include "chrome/browser/chromeos/gdata/drive.pb.h"
17 #include "chrome/browser/chromeos/gdata/drive_cache.h" 16 #include "chrome/browser/chromeos/gdata/drive_cache.h"
18 #include "chrome/browser/chromeos/gdata/drive_files.h" 17 #include "chrome/browser/chromeos/gdata/drive_files.h"
19 #include "chrome/browser/chromeos/gdata/drive_test_util.h" 18 #include "chrome/browser/chromeos/gdata/drive_test_util.h"
19 #include "chrome/browser/google_apis/drive.pb.h"
20 #include "chrome/test/base/testing_profile.h" 20 #include "chrome/test/base/testing_profile.h"
21 #include "content/public/test/test_browser_thread.h" 21 #include "content/public/test/test_browser_thread.h"
22 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
23 23
24 namespace gdata { 24 namespace gdata {
25 namespace { 25 namespace {
26 26
27 // See drive.proto for the difference between the two URLs. 27 // See drive.proto for the difference between the two URLs.
28 const char kResumableEditMediaUrl[] = "http://resumable-edit-media/"; 28 const char kResumableEditMediaUrl[] = "http://resumable-edit-media/";
29 const char kResumableCreateMediaUrl[] = "http://resumable-create-media/"; 29 const char kResumableCreateMediaUrl[] = "http://resumable-create-media/";
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 FilePath::FromUTF8Unsafe("drive/dir2/file11"), 591 FilePath::FromUTF8Unsafe("drive/dir2/file11"),
592 "file11", 592 "file11",
593 base::Bind(&test_util::CopyResultsFromFileMoveCallback, 593 base::Bind(&test_util::CopyResultsFromFileMoveCallback,
594 &error, &drive_file_path)); 594 &error, &drive_file_path));
595 test_util::RunBlockingPoolTask(); 595 test_util::RunBlockingPoolTask();
596 EXPECT_EQ(DRIVE_FILE_ERROR_NOT_FOUND, error); 596 EXPECT_EQ(DRIVE_FILE_ERROR_NOT_FOUND, error);
597 EXPECT_EQ(FilePath(), drive_file_path); 597 EXPECT_EQ(FilePath(), drive_file_path);
598 } 598 }
599 599
600 } // namespace gdata 600 } // namespace gdata
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/gdata/drive_resource_metadata.cc ('k') | chrome/browser/chromeos/gdata/drive_sync_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698