From 650b2d5cdcab7d2c473c00d15b9f343f3a3405bb Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Sun, 10 Feb 2013 03:41:45 +0000 Subject: Merge branch 'master' into file_path_browser version control markers Merge branch 'master' into file_path_browser remove version control Fix typo Merge branch 'master' into file_path_browser Conflicts: chrome/browser/intents/native_services_browsertest.cc chrome/browser/ui/intents/native_file_picker_service.cc Merge branch 'master' into file_path_browser Conflicts: chrome/browser/chromeos/drive/drive_file_system.cc chrome/browser/chromeos/drive/drive_file_system.h chrome/browser/chromeos/drive/drive_file_system_interface.h chrome/browser/chromeos/drive/drive_file_system_unittest.cc chrome/browser/chromeos/drive/file_system/drive_operations.cc chrome/browser/chromeos/login/wallpaper_manager.cc chrome/browser/chromeos/login/wallpaper_manager.h chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc chrome/browser/google_apis/gdata_wapi_operations.cc chrome/browser/google_apis/gdata_wapi_operations.h chrome/browser/google_apis/gdata_wapi_operations_unittest.cc chrome/browser/profiles/off_the_record_profile_impl.cc chrome/browser/profiles/off_the_record_profile_impl.h chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.h chrome/browser/profiles/profile_impl_io_data.cc chrome/browser/profiles/profile_impl_io_data.h chrome/browser/sync_file_system/drive_file_sync_client_unittest.cc chrome/browser/ui/webui/options/manage_profile_handler.cc Long lines long lines some long lines. long lines long lines Beginning of lines. Rename FilePath -> base::FilePath in chrome/browser git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181638 0039d316-1c4b-4281-b951-d872f2087c98 --- .../browser/google_apis/gdata_wapi_parser_unittest.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'chrome/browser/google_apis/gdata_wapi_parser_unittest.cc') diff --git a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc index 64b656b..4824d5b 100644 --- a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc +++ b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc @@ -308,23 +308,23 @@ TEST(GDataWAPIParserTest, AccountMetadataFeedParser) { // Test file extension checking in ResourceEntry::HasDocumentExtension(). TEST(GDataWAPIParserTest, ResourceEntryHasDocumentExtension) { EXPECT_TRUE(ResourceEntry::HasHostedDocumentExtension( - FilePath(FILE_PATH_LITERAL("Test.gdoc")))); + base::FilePath(FILE_PATH_LITERAL("Test.gdoc")))); EXPECT_TRUE(ResourceEntry::HasHostedDocumentExtension( - FilePath(FILE_PATH_LITERAL("Test.gsheet")))); + base::FilePath(FILE_PATH_LITERAL("Test.gsheet")))); EXPECT_TRUE(ResourceEntry::HasHostedDocumentExtension( - FilePath(FILE_PATH_LITERAL("Test.gslides")))); + base::FilePath(FILE_PATH_LITERAL("Test.gslides")))); EXPECT_TRUE(ResourceEntry::HasHostedDocumentExtension( - FilePath(FILE_PATH_LITERAL("Test.gdraw")))); + base::FilePath(FILE_PATH_LITERAL("Test.gdraw")))); EXPECT_TRUE(ResourceEntry::HasHostedDocumentExtension( - FilePath(FILE_PATH_LITERAL("Test.gtable")))); + base::FilePath(FILE_PATH_LITERAL("Test.gtable")))); EXPECT_FALSE(ResourceEntry::HasHostedDocumentExtension( - FilePath(FILE_PATH_LITERAL("Test.tar.gz")))); + base::FilePath(FILE_PATH_LITERAL("Test.tar.gz")))); EXPECT_FALSE(ResourceEntry::HasHostedDocumentExtension( - FilePath(FILE_PATH_LITERAL("Test.txt")))); + base::FilePath(FILE_PATH_LITERAL("Test.txt")))); EXPECT_FALSE(ResourceEntry::HasHostedDocumentExtension( - FilePath(FILE_PATH_LITERAL("Test")))); + base::FilePath(FILE_PATH_LITERAL("Test")))); EXPECT_FALSE(ResourceEntry::HasHostedDocumentExtension( - FilePath(FILE_PATH_LITERAL("")))); + base::FilePath(FILE_PATH_LITERAL("")))); } TEST(GDataWAPIParserTest, ResourceEntryClassifyEntryKind) { -- cgit v1.1