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

Side by Side Diff: chrome/browser/chromeos/extensions/external_filesystem_apitest.cc

Issue 10877006: Rename GDataErrorCode to DriveErrorCode, GDataFileError to DriveFileError (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: minor local variable name fix. Created 8 years, 4 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 | chrome/browser/chromeos/extensions/file_browser_private_api.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
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/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop_proxy.h" 10 #include "base/message_loop_proxy.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/scoped_temp_dir.h" 12 #include "base/scoped_temp_dir.h"
13 #include "base/threading/worker_pool.h" 13 #include "base/threading/worker_pool.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/chromeos/gdata/gdata_errorcode.h"
16 #include "chrome/browser/chromeos/gdata/gdata_file_system.h" 15 #include "chrome/browser/chromeos/gdata/gdata_file_system.h"
17 #include "chrome/browser/chromeos/gdata/gdata_system_service.h" 16 #include "chrome/browser/chromeos/gdata/gdata_system_service.h"
18 #include "chrome/browser/chromeos/gdata/gdata_util.h" 17 #include "chrome/browser/chromeos/gdata/gdata_util.h"
19 #include "chrome/browser/chromeos/gdata/gdata_wapi_parser.h" 18 #include "chrome/browser/chromeos/gdata/gdata_wapi_parser.h"
20 #include "chrome/browser/chromeos/gdata/mock_drive_service.h" 19 #include "chrome/browser/chromeos/gdata/mock_drive_service.h"
21 #include "chrome/browser/chromeos/gdata/operation_registry.h" 20 #include "chrome/browser/chromeos/gdata/operation_registry.h"
22 #include "chrome/browser/extensions/extension_apitest.h" 21 #include "chrome/browser/extensions/extension_apitest.h"
23 #include "chrome/browser/extensions/extension_test_message_listener.h" 22 #include "chrome/browser/extensions/extension_test_message_listener.h"
24 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
25 #include "chrome/browser/ui/browser.h" 24 #include "chrome/browser/ui/browser.h"
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 _, _)) 355 _, _))
357 .WillOnce(MockDownloadFileCallback(gdata::HTTP_SUCCESS)); 356 .WillOnce(MockDownloadFileCallback(gdata::HTTP_SUCCESS));
358 357
359 // On exit, all operations in progress should be cancelled. 358 // On exit, all operations in progress should be cancelled.
360 EXPECT_CALL(*mock_drive_service_, CancelAll()); 359 EXPECT_CALL(*mock_drive_service_, CancelAll());
361 360
362 // All is set... RUN THE TEST. 361 // All is set... RUN THE TEST.
363 EXPECT_TRUE(RunExtensionSubtest("filebrowser_component", "remote_search.html", 362 EXPECT_TRUE(RunExtensionSubtest("filebrowser_component", "remote_search.html",
364 kComponentFlags)) << message_; 363 kComponentFlags)) << message_;
365 } 364 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/file_browser_private_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698