diff options
Diffstat (limited to 'chrome/browser/google_apis')
14 files changed, 196 insertions, 203 deletions
diff --git a/chrome/browser/google_apis/base_operations.cc b/chrome/browser/google_apis/base_operations.cc index c6f425c..6692a8a 100644 --- a/chrome/browser/google_apis/base_operations.cc +++ b/chrome/browser/google_apis/base_operations.cc @@ -186,7 +186,7 @@ void UrlFetchOperationBase::Start(const std::string& access_token, request_type == URLFetcher::PATCH) { // Set empty upload content-type and upload content, so that // the request will have no "Content-type: " header and no content. - url_fetcher_->SetUploadData("", ""); + url_fetcher_->SetUploadData(std::string(), std::string()); } } diff --git a/chrome/browser/google_apis/base_operations_unittest.cc b/chrome/browser/google_apis/base_operations_unittest.cc index 2f7e01a..047e5c2 100644 --- a/chrome/browser/google_apis/base_operations_unittest.cc +++ b/chrome/browser/google_apis/base_operations_unittest.cc @@ -66,9 +66,9 @@ class BaseOperationsTest : public testing::Test { virtual void SetUp() OVERRIDE { profile_.reset(new TestingProfile); runner_.reset(new OperationRunner(profile_.get(), - NULL /* url_request_context_getter */, - std::vector<std::string>() /* scopes */, - "" /* custom user agent */)); + NULL /* url_request_context_getter */, + std::vector<std::string>() /* scopes */, + std::string() /* custom user agent */)); runner_->Initialize(); LOG(ERROR) << "Initialized."; } diff --git a/chrome/browser/google_apis/drive_api_operations.cc b/chrome/browser/google_apis/drive_api_operations.cc index 7bab455..1206743 100644 --- a/chrome/browser/google_apis/drive_api_operations.cc +++ b/chrome/browser/google_apis/drive_api_operations.cc @@ -200,7 +200,7 @@ GURL CreateDirectoryOperation::GetURL() const { if (parent_resource_id_.empty() || directory_name_.empty()) { return GURL(); } - return url_generator_.GetFilelistUrl(GURL(), ""); + return url_generator_.GetFilelistUrl(GURL(), std::string()); } net::URLFetcher::RequestType CreateDirectoryOperation::GetRequestType() const { diff --git a/chrome/browser/google_apis/drive_api_operations_unittest.cc b/chrome/browser/google_apis/drive_api_operations_unittest.cc index 36c2c89..b6a0f61 100644 --- a/chrome/browser/google_apis/drive_api_operations_unittest.cc +++ b/chrome/browser/google_apis/drive_api_operations_unittest.cc @@ -867,7 +867,7 @@ TEST_F(DriveApiOperationsTest, UploadExistingFileOperation) { kTestContentType, kTestContent.size(), "resource_id", // The resource id of the file to be overwritten. - "", // No etag. + std::string(), // No etag. CreateComposedCallback( base::Bind(&test_util::RunAndQuit), test_util::CreateCopyResultCallback(&error, &upload_url))); diff --git a/chrome/browser/google_apis/drive_api_url_generator_unittest.cc b/chrome/browser/google_apis/drive_api_url_generator_unittest.cc index 818fb2d..bcb6c6d 100644 --- a/chrome/browser/google_apis/drive_api_url_generator_unittest.cc +++ b/chrome/browser/google_apis/drive_api_url_generator_unittest.cc @@ -69,7 +69,7 @@ TEST_F(DriveApiUrlGeneratorTest, GetFilelistUrl) { // Use default URL, if |override_url| is empty. // Do not add q parameter if |search_string| is empty. EXPECT_EQ("https://www.googleapis.com/drive/v2/files", - url_generator_.GetFilelistUrl(GURL(), "").spec()); + url_generator_.GetFilelistUrl(GURL(), std::string()).spec()); // Set q parameter if non-empty |search_string| is given. EXPECT_EQ("https://www.googleapis.com/drive/v2/files?q=query", @@ -77,9 +77,10 @@ TEST_F(DriveApiUrlGeneratorTest, GetFilelistUrl) { // Use the |override_url| for the base URL if given. // The behavior for the |search_string| should be as same as above cases. - EXPECT_EQ("https://localhost/drive/v2/files", - url_generator_.GetFilelistUrl( - GURL("https://localhost/drive/v2/files"), "").spec()); + EXPECT_EQ( + "https://localhost/drive/v2/files", + url_generator_.GetFilelistUrl(GURL("https://localhost/drive/v2/files"), + std::string()).spec()); EXPECT_EQ("https://localhost/drive/v2/files?q=query", url_generator_.GetFilelistUrl( GURL("https://localhost/drive/v2/files"), "query").spec()); diff --git a/chrome/browser/google_apis/drive_uploader_unittest.cc b/chrome/browser/google_apis/drive_uploader_unittest.cc index 5f3bb62..f522a87 100644 --- a/chrome/browser/google_apis/drive_uploader_unittest.cc +++ b/chrome/browser/google_apis/drive_uploader_unittest.cc @@ -298,7 +298,7 @@ TEST_F(DriveUploaderTest, UploadExisting0KB) { base::FilePath::FromUTF8Unsafe(kTestDrivePath), local_path, kTestMimeType, - "", // etag + std::string(), // etag test_util::CreateCopyResultCallback( &error, &drive_path, &file_path, &resource_entry)); test_util::RunBlockingPoolTask(); @@ -330,7 +330,7 @@ TEST_F(DriveUploaderTest, UploadExisting512KB) { base::FilePath::FromUTF8Unsafe(kTestDrivePath), local_path, kTestMimeType, - "", // etag + std::string(), // etag test_util::CreateCopyResultCallback( &error, &drive_path, &file_path, &resource_entry)); test_util::RunBlockingPoolTask(); @@ -363,7 +363,7 @@ TEST_F(DriveUploaderTest, UploadExisting1234KB) { base::FilePath::FromUTF8Unsafe(kTestDrivePath), local_path, kTestMimeType, - "", // etag + std::string(), // etag test_util::CreateCopyResultCallback( &error, &drive_path, &file_path, &resource_entry)); test_util::RunBlockingPoolTask(); @@ -429,7 +429,7 @@ TEST_F(DriveUploaderTest, InitiateUploadFail) { base::FilePath::FromUTF8Unsafe(kTestDrivePath), local_path, kTestMimeType, - "", // etag + std::string(), // etag test_util::CreateCopyResultCallback( &error, &drive_path, &file_path, &resource_entry)); test_util::RunBlockingPoolTask(); @@ -508,7 +508,7 @@ TEST_F(DriveUploaderTest, ResumeUploadFail) { base::FilePath::FromUTF8Unsafe(kTestDrivePath), local_path, kTestMimeType, - "", // etag + std::string(), // etag test_util::CreateCopyResultCallback( &error, &drive_path, &file_path, &resource_entry)); test_util::RunBlockingPoolTask(); @@ -528,7 +528,7 @@ TEST_F(DriveUploaderTest, NonExistingSourceFile) { base::FilePath::FromUTF8Unsafe(kTestDrivePath), temp_dir_.path().AppendASCII("_this_path_should_not_exist_"), kTestMimeType, - "", // etag + std::string(), // etag test_util::CreateCopyResultCallback( &error, &drive_path, &file_path, &resource_entry)); test_util::RunBlockingPoolTask(); diff --git a/chrome/browser/google_apis/fake_drive_service.cc b/chrome/browser/google_apis/fake_drive_service.cc index d91aced..d5cb4ad 100644 --- a/chrome/browser/google_apis/fake_drive_service.cc +++ b/chrome/browser/google_apis/fake_drive_service.cc @@ -340,10 +340,10 @@ void FakeDriveService::GetAllResourceList( DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(!callback.is_null()); - GetResourceList(GURL(), // no next feed - 0, // start changestamp - "", // empty search query - "", // no directory resource id, + GetResourceList(GURL(), // no next feed + 0, // start changestamp + std::string(), // empty search query + std::string(), // no directory resource id, callback); } @@ -354,9 +354,9 @@ void FakeDriveService::GetResourceListInDirectory( DCHECK(!directory_resource_id.empty()); DCHECK(!callback.is_null()); - GetResourceList(GURL(), // no next feed - 0, // start changestamp - "", // empty search query + GetResourceList(GURL(), // no next feed + 0, // start changestamp + std::string(), // empty search query directory_resource_id, callback); } @@ -367,10 +367,10 @@ void FakeDriveService::Search(const std::string& search_query, DCHECK(!search_query.empty()); DCHECK(!callback.is_null()); - GetResourceList(GURL(), // no next feed - 0, // start changestamp + GetResourceList(GURL(), // no next feed + 0, // start changestamp search_query, - "", // no directory resource id, + std::string(), // no directory resource id, callback); } @@ -395,10 +395,10 @@ void FakeDriveService::GetChangeList(int64 start_changestamp, DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(!callback.is_null()); - GetResourceList(GURL(), // no next feed + GetResourceList(GURL(), // no next feed start_changestamp, - "", // empty search query - "", // no directory resource id, + std::string(), // empty search query + std::string(), // no directory resource id, callback); } diff --git a/chrome/browser/google_apis/fake_drive_service_unittest.cc b/chrome/browser/google_apis/fake_drive_service_unittest.cc index e89ed15..2f94ba5 100644 --- a/chrome/browser/google_apis/fake_drive_service_unittest.cc +++ b/chrome/browser/google_apis/fake_drive_service_unittest.cc @@ -96,9 +96,9 @@ TEST_F(FakeDriveServiceTest, GetResourceList_All) { scoped_ptr<ResourceList> resource_list; fake_service_.GetResourceList( GURL(), - 0, // start_changestamp - "", // search_query - "", // directory_resource_id + 0, // start_changestamp + std::string(), // search_query + std::string(), // directory_resource_id test_util::CreateCopyResultCallback(&error, &resource_list)); message_loop_.RunUntilIdle(); @@ -117,9 +117,9 @@ TEST_F(FakeDriveServiceTest, GetResourceList_WithStartIndex) { scoped_ptr<ResourceList> resource_list; fake_service_.GetResourceList( GURL("http://dummyurl/?start-offset=2"), - 0, // start_changestamp - "", // search_query - "", // directory_resource_id + 0, // start_changestamp + std::string(), // search_query + std::string(), // directory_resource_id test_util::CreateCopyResultCallback(&error, &resource_list)); message_loop_.RunUntilIdle(); @@ -139,9 +139,9 @@ TEST_F(FakeDriveServiceTest, GetResourceList_WithStartIndexAndMaxResults) { scoped_ptr<ResourceList> resource_list; fake_service_.GetResourceList( GURL("http://localhost/?start-offset=2&max-results=5"), - 0, // start_changestamp - "", // search_query - "", // directory_resource_id + 0, // start_changestamp + std::string(), // search_query + std::string(), // directory_resource_id test_util::CreateCopyResultCallback(&error, &resource_list)); message_loop_.RunUntilIdle(); @@ -168,9 +168,9 @@ TEST_F(FakeDriveServiceTest, GetResourceList_WithDefaultMaxResultsChanged) { scoped_ptr<ResourceList> resource_list; fake_service_.GetResourceList( GURL(), - 0, // start_changestamp - "", // search_query - "", // directory_resource_id + 0, // start_changestamp + std::string(), // search_query + std::string(), // directory_resource_id test_util::CreateCopyResultCallback(&error, &resource_list)); message_loop_.RunUntilIdle(); @@ -196,8 +196,8 @@ TEST_F(FakeDriveServiceTest, GetResourceList_InRootDirectory) { scoped_ptr<ResourceList> resource_list; fake_service_.GetResourceList( GURL(), - 0, // start_changestamp - "", // search_query + 0, // start_changestamp + std::string(), // search_query fake_service_.GetRootResourceId(), // directory_resource_id test_util::CreateCopyResultCallback(&error, &resource_list)); message_loop_.RunUntilIdle(); @@ -217,9 +217,9 @@ TEST_F(FakeDriveServiceTest, GetResourceList_Search) { scoped_ptr<ResourceList> resource_list; fake_service_.GetResourceList( GURL(), - 0, // start_changestamp - "File", // search_query - "", // directory_resource_id + 0, // start_changestamp + "File", // search_query + std::string(), // directory_resource_id test_util::CreateCopyResultCallback(&error, &resource_list)); message_loop_.RunUntilIdle(); @@ -239,9 +239,9 @@ TEST_F(FakeDriveServiceTest, GetResourceList_SearchWithAttribute) { scoped_ptr<ResourceList> resource_list; fake_service_.GetResourceList( GURL(), - 0, // start_changestamp + 0, // start_changestamp "title:1.txt", // search_query - "", // directory_resource_id + std::string(), // directory_resource_id test_util::CreateCopyResultCallback(&error, &resource_list)); message_loop_.RunUntilIdle(); @@ -261,9 +261,9 @@ TEST_F(FakeDriveServiceTest, GetResourceList_SearchMultipleQueries) { scoped_ptr<ResourceList> resource_list; fake_service_.GetResourceList( GURL(), - 0, // start_changestamp + 0, // start_changestamp "Directory 1", // search_query - "", // directory_resource_id + std::string(), // directory_resource_id test_util::CreateCopyResultCallback(&error, &resource_list)); message_loop_.RunUntilIdle(); @@ -274,9 +274,9 @@ TEST_F(FakeDriveServiceTest, GetResourceList_SearchMultipleQueries) { fake_service_.GetResourceList( GURL(), - 0, // start_changestamp + 0, // start_changestamp "\"Directory 1\"", // search_query - "", // directory_resource_id + std::string(), // directory_resource_id test_util::CreateCopyResultCallback(&error, &resource_list)); message_loop_.RunUntilIdle(); @@ -299,9 +299,9 @@ TEST_F(FakeDriveServiceTest, GetResourceList_NoNewEntries) { scoped_ptr<ResourceList> resource_list; fake_service_.GetResourceList( GURL(), - 654321 + 1, // start_changestamp - "", // search_query - "", // directory_resource_id + 654321 + 1, // start_changestamp + std::string(), // search_query + std::string(), // directory_resource_id test_util::CreateCopyResultCallback(&error, &resource_list)); message_loop_.RunUntilIdle(); @@ -331,9 +331,9 @@ TEST_F(FakeDriveServiceTest, GetResourceList_WithNewEntry) { scoped_ptr<ResourceList> resource_list; fake_service_.GetResourceList( GURL(), - 654321 + 1, // start_changestamp - "", // search_query - "", // directory_resource_id + 654321 + 1, // start_changestamp + std::string(), // search_query + std::string(), // directory_resource_id test_util::CreateCopyResultCallback(&error, &resource_list)); message_loop_.RunUntilIdle(); @@ -354,9 +354,9 @@ TEST_F(FakeDriveServiceTest, GetResourceList_Offline) { scoped_ptr<ResourceList> resource_list; fake_service_.GetResourceList( GURL(), - 0, // start_changestamp - "", // search_query - "", // directory_resource_id + 0, // start_changestamp + std::string(), // search_query + std::string(), // directory_resource_id test_util::CreateCopyResultCallback(&error, &resource_list)); message_loop_.RunUntilIdle(); @@ -845,7 +845,7 @@ TEST_F(FakeDriveServiceTest, DeleteResource_ExistingFile) { GDataErrorCode error = GDATA_OTHER_ERROR; fake_service_.DeleteResource("file:2_file_resource_id", - "", // etag + std::string(), // etag test_util::CreateCopyResultCallback(&error)); message_loop_.RunUntilIdle(); @@ -860,7 +860,7 @@ TEST_F(FakeDriveServiceTest, DeleteResource_NonexistingFile) { GDataErrorCode error = GDATA_OTHER_ERROR; fake_service_.DeleteResource("file:nonexisting_resource_id", - "", // etag + std::string(), // etag test_util::CreateCopyResultCallback(&error)); message_loop_.RunUntilIdle(); @@ -874,7 +874,7 @@ TEST_F(FakeDriveServiceTest, DeleteResource_Offline) { GDataErrorCode error = GDATA_OTHER_ERROR; fake_service_.DeleteResource("file:2_file_resource_id", - "", // etag + std::string(), // etag test_util::CreateCopyResultCallback(&error)); message_loop_.RunUntilIdle(); @@ -1506,7 +1506,7 @@ TEST_F(FakeDriveServiceTest, InitiateUploadExistingFile_Offline) { "test/foo", 13, "file:2_file_resource_id", - "", // etag + std::string(), // etag test_util::CreateCopyResultCallback(&error, &upload_location)); message_loop_.RunUntilIdle(); @@ -1525,7 +1525,7 @@ TEST_F(FakeDriveServiceTest, InitiateUploadExistingFile_NotFound) { "test/foo", 13, "non_existent", - "", // etag + std::string(), // etag test_util::CreateCopyResultCallback(&error, &upload_location)); message_loop_.RunUntilIdle(); diff --git a/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc b/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc index 1a15c62..7f2395d 100644 --- a/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc +++ b/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc @@ -325,10 +325,10 @@ TEST_F(GDataWapiOperationsTest, GetResourceListOperation_DefaultFeed) { &operation_registry_, request_context_getter_.get(), *url_generator_, - GURL(), // Pass an empty URL to use the default feed - 0, // start changestamp - "", // search string - "", // directory resource ID + GURL(), // Pass an empty URL to use the default feed + 0, // start changestamp + std::string(), // search string + std::string(), // directory resource ID CreateComposedCallback( base::Bind(&test_util::RunAndQuit), test_util::CreateCopyResultCallback(&result_code, &result_data))); @@ -360,9 +360,9 @@ TEST_F(GDataWapiOperationsTest, GetResourceListOperation_ValidFeed) { request_context_getter_.get(), *url_generator_, test_server_.GetURL("/files/chromeos/gdata/root_feed.json"), - 0, // start changestamp - "", // search string - "", // directory resource ID + 0, // start changestamp + std::string(), // search string + std::string(), // directory resource ID CreateComposedCallback( base::Bind(&test_util::RunAndQuit), test_util::CreateCopyResultCallback(&result_code, &result_data))); @@ -395,9 +395,9 @@ TEST_F(GDataWapiOperationsTest, GetResourceListOperation_InvalidFeed) { request_context_getter_.get(), *url_generator_, test_server_.GetURL("/files/chromeos/gdata/testfile.txt"), - 0, // start changestamp - "", // search string - "", // directory resource ID + 0, // start changestamp + std::string(), // search string + std::string(), // directory resource ID CreateComposedCallback( base::Bind(&test_util::RunAndQuit), test_util::CreateCopyResultCallback(&result_code, &result_data))); @@ -548,11 +548,10 @@ TEST_F(GDataWapiOperationsTest, DeleteResourceOperation) { &operation_registry_, request_context_getter_.get(), *url_generator_, - CreateComposedCallback( - base::Bind(&test_util::RunAndQuit), - test_util::CreateCopyResultCallback(&result_code)), + CreateComposedCallback(base::Bind(&test_util::RunAndQuit), + test_util::CreateCopyResultCallback(&result_code)), "file:2_file_resource_id", - ""); + std::string()); operation->Start(kTestGDataAuthToken, kTestUserAgent, base::Bind(&test_util::DoNothingForReAuthenticateCallback)); @@ -1135,7 +1134,7 @@ TEST_F(GDataWapiOperationsTest, UploadNewLargeFile) { // The test is almost identical to UploadNewFile. The only difference is the // expectation for the Content-Range header. TEST_F(GDataWapiOperationsTest, UploadNewEmptyFile) { - const std::string kUploadContent = ""; + const std::string kUploadContent; GDataErrorCode result_code = GDATA_OTHER_ERROR; GURL upload_url; @@ -1244,7 +1243,7 @@ TEST_F(GDataWapiOperationsTest, UploadExistingFile) { "text/plain", kUploadContent.size(), "file:foo", - "" /* etag */); + std::string() /* etag */); initiate_operation->Start( kTestGDataAuthToken, kTestUserAgent, diff --git a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc index f85d325..d4fbba4 100644 --- a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc +++ b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc @@ -324,7 +324,7 @@ TEST(GDataWAPIParserTest, ResourceEntryHasDocumentExtension) { EXPECT_FALSE(ResourceEntry::HasHostedDocumentExtension( base::FilePath(FILE_PATH_LITERAL("Test")))); EXPECT_FALSE(ResourceEntry::HasHostedDocumentExtension( - base::FilePath(FILE_PATH_LITERAL("")))); + base::FilePath(FILE_PATH_LITERAL(std::string())))); } TEST(GDataWAPIParserTest, ResourceEntryClassifyEntryKind) { diff --git a/chrome/browser/google_apis/gdata_wapi_service.cc b/chrome/browser/google_apis/gdata_wapi_service.cc index 47edcf6..2649049 100644 --- a/chrome/browser/google_apis/gdata_wapi_service.cc +++ b/chrome/browser/google_apis/gdata_wapi_service.cc @@ -199,15 +199,14 @@ void GDataWapiService::GetAllResourceList( DCHECK(!callback.is_null()); runner_->StartOperationWithRetry( - new GetResourceListOperation( - operation_registry(), - url_request_context_getter_, - url_generator_, - GURL(), // No override url - 0, // start changestamp - "", // empty search query - "", // no directory resource id - callback)); + new GetResourceListOperation(operation_registry(), + url_request_context_getter_, + url_generator_, + GURL(), // No override url + 0, // start changestamp + std::string(), // empty search query + std::string(), // no directory resource id + callback)); } void GDataWapiService::GetResourceListInDirectory( @@ -218,15 +217,14 @@ void GDataWapiService::GetResourceListInDirectory( DCHECK(!callback.is_null()); runner_->StartOperationWithRetry( - new GetResourceListOperation( - operation_registry(), - url_request_context_getter_, - url_generator_, - GURL(), // No override url - 0, // start changestamp - "", // empty search query - directory_resource_id, - callback)); + new GetResourceListOperation(operation_registry(), + url_request_context_getter_, + url_generator_, + GURL(), // No override url + 0, // start changestamp + std::string(), // empty search query + directory_resource_id, + callback)); } void GDataWapiService::Search(const std::string& search_query, @@ -236,15 +234,14 @@ void GDataWapiService::Search(const std::string& search_query, DCHECK(!callback.is_null()); runner_->StartOperationWithRetry( - new GetResourceListOperation( - operation_registry(), - url_request_context_getter_, - url_generator_, - GURL(), // No override url - 0, // start changestamp - search_query, - "", // no directory resource id - callback)); + new GetResourceListOperation(operation_registry(), + url_request_context_getter_, + url_generator_, + GURL(), // No override url + 0, // start changestamp + search_query, + std::string(), // no directory resource id + callback)); } void GDataWapiService::SearchInDirectory( @@ -274,15 +271,14 @@ void GDataWapiService::GetChangeList(int64 start_changestamp, DCHECK(!callback.is_null()); runner_->StartOperationWithRetry( - new GetResourceListOperation( - operation_registry(), - url_request_context_getter_, - url_generator_, - GURL(), // No override url - start_changestamp, - "", // empty search query - "", // no directory resource id - callback)); + new GetResourceListOperation(operation_registry(), + url_request_context_getter_, + url_generator_, + GURL(), // No override url + start_changestamp, + std::string(), // empty search query + std::string(), // no directory resource id + callback)); } void GDataWapiService::ContinueGetResourceList( @@ -293,15 +289,14 @@ void GDataWapiService::ContinueGetResourceList( DCHECK(!callback.is_null()); runner_->StartOperationWithRetry( - new GetResourceListOperation( - operation_registry(), - url_request_context_getter_, - url_generator_, - override_url, - 0, // start changestamp - "", // empty search query - "", // no directory resource id - callback)); + new GetResourceListOperation(operation_registry(), + url_request_context_getter_, + url_generator_, + override_url, + 0, // start changestamp + std::string(), // empty search query + std::string(), // no directory resource id + callback)); } void GDataWapiService::GetResourceEntry( diff --git a/chrome/browser/google_apis/gdata_wapi_url_generator_unittest.cc b/chrome/browser/google_apis/gdata_wapi_url_generator_unittest.cc index 571a661..de80699 100644 --- a/chrome/browser/google_apis/gdata_wapi_url_generator_unittest.cc +++ b/chrome/browser/google_apis/gdata_wapi_url_generator_unittest.cc @@ -32,29 +32,29 @@ TEST_F(GDataWapiUrlGeneratorTest, AddInitiateUploadUrlParams) { } TEST_F(GDataWapiUrlGeneratorTest, AddFeedUrlParams) { - EXPECT_EQ("http://www.example.com/?v=3&alt=json&showroot=true&" - "showfolders=true" - "&include-shared=true" - "&max-results=100" - "&include-installed-apps=true", - GDataWapiUrlGenerator::AddFeedUrlParams( - GURL("http://www.example.com"), - 100, // num_items_to_fetch - 0, // changestamp - "" // search_string - ).spec()); - EXPECT_EQ("http://www.example.com/?v=3&alt=json&showroot=true&" - "showfolders=true" - "&include-shared=true" - "&max-results=100" - "&include-installed-apps=true" - "&start-index=123", - GDataWapiUrlGenerator::AddFeedUrlParams( - GURL("http://www.example.com"), - 100, // num_items_to_fetch - 123, // changestamp - "" // search_string - ).spec()); + EXPECT_EQ( + "http://www.example.com/?v=3&alt=json&showroot=true&" + "showfolders=true" + "&include-shared=true" + "&max-results=100" + "&include-installed-apps=true", + GDataWapiUrlGenerator::AddFeedUrlParams(GURL("http://www.example.com"), + 100, // num_items_to_fetch + 0, // changestamp + std::string() // search_string + ).spec()); + EXPECT_EQ( + "http://www.example.com/?v=3&alt=json&showroot=true&" + "showfolders=true" + "&include-shared=true" + "&max-results=100" + "&include-installed-apps=true" + "&start-index=123", + GDataWapiUrlGenerator::AddFeedUrlParams(GURL("http://www.example.com"), + 100, // num_items_to_fetch + 123, // changestamp + std::string() // search_string + ).spec()); EXPECT_EQ("http://www.example.com/?v=3&alt=json&showroot=true&" "showfolders=true" "&include-shared=true" @@ -72,53 +72,52 @@ TEST_F(GDataWapiUrlGeneratorTest, AddFeedUrlParams) { TEST_F(GDataWapiUrlGeneratorTest, GenerateResourceListUrl) { // This is the very basic URL for the GetResourceList operation. - EXPECT_EQ( - "https://docs.google.com/feeds/default/private/full" - "?v=3&alt=json&showroot=true&showfolders=true&include-shared=true" - "&max-results=500&include-installed-apps=true", - url_generator_.GenerateResourceListUrl(GURL(), // override_url, - 0, // start_changestamp, - "", // search_string, - "" // directory resource ID - ).spec()); + EXPECT_EQ("https://docs.google.com/feeds/default/private/full" + "?v=3&alt=json&showroot=true&showfolders=true&include-shared=true" + "&max-results=500&include-installed-apps=true", + url_generator_.GenerateResourceListUrl( + GURL(), // override_url, + 0, // start_changestamp, + std::string(), // search_string, + std::string() // directory resource ID + ).spec()); // With an override URL provided, the base URL is changed, but the default // parameters remain as-is. - EXPECT_EQ( - "http://localhost/" - "?v=3&alt=json&showroot=true&showfolders=true&include-shared=true" - "&max-results=500&include-installed-apps=true", - url_generator_.GenerateResourceListUrl( - GURL("http://localhost/"), // override_url, - 0, // start_changestamp, - "", // search_string, - "" // directory resource ID - ).spec()); + EXPECT_EQ("http://localhost/" + "?v=3&alt=json&showroot=true&showfolders=true&include-shared=true" + "&max-results=500&include-installed-apps=true", + url_generator_.GenerateResourceListUrl( + GURL("http://localhost/"), // override_url, + 0, // start_changestamp, + std::string(), // search_string, + std::string() // directory resource ID + ).spec()); // With a non-zero start_changestamp provided, the base URL is changed from // "full" to "changes", and "start-index" parameter is added. - EXPECT_EQ( - "https://docs.google.com/feeds/default/private/changes" - "?v=3&alt=json&showroot=true&showfolders=true&include-shared=true" - "&max-results=500&include-installed-apps=true" - "&start-index=100", - url_generator_.GenerateResourceListUrl(GURL(), // override_url, - 100, // start_changestamp, - "", // search_string, - "" // directory resource ID - ).spec()); + EXPECT_EQ("https://docs.google.com/feeds/default/private/changes" + "?v=3&alt=json&showroot=true&showfolders=true&include-shared=true" + "&max-results=500&include-installed-apps=true" + "&start-index=100", + url_generator_.GenerateResourceListUrl( + GURL(), // override_url, + 100, // start_changestamp, + std::string(), // search_string, + std::string() // directory resource ID + ).spec()); // With a non-empty search string provided, "max-results" value is changed, // and "q" parameter is added. - EXPECT_EQ( - "https://docs.google.com/feeds/default/private/full" - "?v=3&alt=json&showroot=true&showfolders=true&include-shared=true" - "&max-results=50&include-installed-apps=true&q=foo", - url_generator_.GenerateResourceListUrl(GURL(), // override_url, - 0, // start_changestamp, - "foo", // search_string, - "" // directory resource ID - ).spec()); + EXPECT_EQ("https://docs.google.com/feeds/default/private/full" + "?v=3&alt=json&showroot=true&showfolders=true&include-shared=true" + "&max-results=50&include-installed-apps=true&q=foo", + url_generator_.GenerateResourceListUrl( + GURL(), // override_url, + 0, // start_changestamp, + "foo", // search_string, + std::string() // directory resource ID + ).spec()); // With a non-empty directory resource ID provided, the base URL is // changed, but the default parameters remain. @@ -127,24 +126,23 @@ TEST_F(GDataWapiUrlGeneratorTest, GenerateResourceListUrl) { "?v=3&alt=json&showroot=true&showfolders=true&include-shared=true" "&max-results=500&include-installed-apps=true", url_generator_.GenerateResourceListUrl(GURL(), // override_url, - 0, // start_changestamp, - "", // search_string, + 0, // start_changestamp, + std::string(), // search_string, "XXX" // directory resource ID ).spec()); // With a non-empty override_url provided, the base URL is changed, but // the default parameters remain. Note that start-index should not be // overridden. - EXPECT_EQ( - "http://example.com/" - "?start-index=123&v=3&alt=json&showroot=true&showfolders=true" - "&include-shared=true&max-results=500&include-installed-apps=true", - url_generator_.GenerateResourceListUrl( - GURL("http://example.com/?start-index=123"), // override_url, - 100, // start_changestamp, - "", // search_string, - "XXX" // directory resource ID - ).spec()); + EXPECT_EQ("http://example.com/" + "?start-index=123&v=3&alt=json&showroot=true&showfolders=true" + "&include-shared=true&max-results=500&include-installed-apps=true", + url_generator_.GenerateResourceListUrl( + GURL("http://example.com/?start-index=123"), // override_url, + 100, // start_changestamp, + std::string(), // search_string, + "XXX" // directory resource ID + ).spec()); } TEST_F(GDataWapiUrlGeneratorTest, GenerateEditUrl) { diff --git a/chrome/browser/google_apis/operation_util_unittest.cc b/chrome/browser/google_apis/operation_util_unittest.cc index 8a8ffe4..14e4c5dd 100644 --- a/chrome/browser/google_apis/operation_util_unittest.cc +++ b/chrome/browser/google_apis/operation_util_unittest.cc @@ -11,7 +11,7 @@ namespace util { TEST(GenerateIfMatchHeaderTest, GenerateIfMatchHeader) { // The header matched to all etag should be returned for empty etag. - EXPECT_EQ("If-Match: *", GenerateIfMatchHeader("")); + EXPECT_EQ("If-Match: *", GenerateIfMatchHeader(std::string())); // Otherwise, the returned header should be matched to the given etag. EXPECT_EQ("If-Match: abcde", GenerateIfMatchHeader("abcde")); diff --git a/chrome/browser/google_apis/test_server/http_server_unittest.cc b/chrome/browser/google_apis/test_server/http_server_unittest.cc index e242098..d837baf 100644 --- a/chrome/browser/google_apis/test_server/http_server_unittest.cc +++ b/chrome/browser/google_apis/test_server/http_server_unittest.cc @@ -38,7 +38,7 @@ std::string GetContentTypeFromFetcher(const net::URLFetcher& fetcher) { if (headers->GetMimeType(&content_type)) return content_type; } - return ""; + return std::string(); } } // namespace |