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

Side by Side Diff: chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc

Issue 221853002: drive: Stop using GData WAPI formatted JSON file in file_system_apitest_chromeos.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/apps/app_browsertest_util.h" 5 #include "chrome/browser/apps/app_browsertest_util.h"
6 #include "chrome/browser/chromeos/drive/drive_integration_service.h" 6 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
7 #include "chrome/browser/chromeos/drive/file_system_interface.h" 7 #include "chrome/browser/chromeos/drive/file_system_interface.h"
8 #include "chrome/browser/chromeos/drive/file_system_util.h" 8 #include "chrome/browser/chromeos/drive/file_system_util.h"
9 #include "chrome/browser/chromeos/drive/test_util.h" 9 #include "chrome/browser/chromeos/drive/test_util.h"
10 #include "chrome/browser/drive/fake_drive_service.h" 10 #include "chrome/browser/drive/fake_drive_service.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 virtual void TearDown() OVERRIDE { 55 virtual void TearDown() OVERRIDE {
56 FileSystemChooseEntryFunction::StopSkippingPickerForTest(); 56 FileSystemChooseEntryFunction::StopSkippingPickerForTest();
57 PlatformAppBrowserTest::TearDown(); 57 PlatformAppBrowserTest::TearDown();
58 }; 58 };
59 59
60 private: 60 private:
61 drive::DriveIntegrationService* CreateDriveIntegrationService( 61 drive::DriveIntegrationService* CreateDriveIntegrationService(
62 Profile* profile) { 62 Profile* profile) {
63 fake_drive_service_ = new drive::FakeDriveService; 63 fake_drive_service_ = new drive::FakeDriveService;
64 fake_drive_service_->LoadResourceListForWapi(
65 "gdata/empty_feed.json");
66 fake_drive_service_->LoadAccountMetadataForWapi(
67 "gdata/account_metadata.json");
68 fake_drive_service_->LoadAppListForDriveApi("drive/applist.json"); 64 fake_drive_service_->LoadAppListForDriveApi("drive/applist.json");
69 65
70 SetUpTestFileHierarchy(); 66 SetUpTestFileHierarchy();
71 67
72 integration_service_ = new drive::DriveIntegrationService( 68 integration_service_ = new drive::DriveIntegrationService(
73 profile, NULL, fake_drive_service_, std::string(), 69 profile, NULL, fake_drive_service_, std::string(),
74 test_cache_root_.path(), NULL); 70 test_cache_root_.path(), NULL);
75 return integration_service_; 71 return integration_service_;
76 } 72 }
77 73
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 drive::util::GetDriveMountPointPath(browser()->profile()).AppendASCII( 176 drive::util::GetDriveMountPointPath(browser()->profile()).AppendASCII(
181 "root/subdir"); 177 "root/subdir");
182 FileSystemChooseEntryFunction::SkipPickerAndAlwaysSelectPathForTest( 178 FileSystemChooseEntryFunction::SkipPickerAndAlwaysSelectPathForTest(
183 &test_directory); 179 &test_directory);
184 ASSERT_TRUE(RunPlatformAppTest( 180 ASSERT_TRUE(RunPlatformAppTest(
185 "api_test/file_system/open_directory_with_only_write")) 181 "api_test/file_system/open_directory_with_only_write"))
186 << message_; 182 << message_;
187 } 183 }
188 184
189 } // namespace extensions 185 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698