| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/media_galleries/fileapi/picasa_data_provider.h" | 5 #include "chrome/browser/media_galleries/fileapi/picasa_data_provider.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 protected: | 288 protected: |
| 289 PicasaDataProvider::DataType RequestedDataType() const override { | 289 PicasaDataProvider::DataType RequestedDataType() const override { |
| 290 return PicasaDataProvider::LIST_OF_ALBUMS_AND_FOLDERS_DATA; | 290 return PicasaDataProvider::LIST_OF_ALBUMS_AND_FOLDERS_DATA; |
| 291 } | 291 } |
| 292 void VerifyRefreshResults(bool parse_success) override { | 292 void VerifyRefreshResults(bool parse_success) override { |
| 293 EXPECT_FALSE(parse_success); | 293 EXPECT_FALSE(parse_success); |
| 294 TestDone(); | 294 TestDone(); |
| 295 } | 295 } |
| 296 }; | 296 }; |
| 297 | 297 |
| 298 // This test is flaky. See crbug.com/667059 | |
| 299 IN_PROC_BROWSER_TEST_F(PicasaDataProviderNoDatabaseGetListTest, | 298 IN_PROC_BROWSER_TEST_F(PicasaDataProviderNoDatabaseGetListTest, |
| 300 DISABLED_NoDatabaseGetList) { | 299 NoDatabaseGetList) { |
| 301 RunTest(); | 300 RunTest(); |
| 302 } | 301 } |
| 303 | 302 |
| 304 class PicasaDataProviderNoDatabaseGetAlbumsImagesTest | 303 class PicasaDataProviderNoDatabaseGetAlbumsImagesTest |
| 305 : public PicasaDataProviderTest { | 304 : public PicasaDataProviderTest { |
| 306 protected: | 305 protected: |
| 307 PicasaDataProvider::DataType RequestedDataType() const override { | 306 PicasaDataProvider::DataType RequestedDataType() const override { |
| 308 return PicasaDataProvider::ALBUMS_IMAGES_DATA; | 307 return PicasaDataProvider::ALBUMS_IMAGES_DATA; |
| 309 } | 308 } |
| 310 void VerifyRefreshResults(bool parse_success) override { | 309 void VerifyRefreshResults(bool parse_success) override { |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 559 base::Unretained(this))); | 558 base::Unretained(this))); |
| 560 } | 559 } |
| 561 }; | 560 }; |
| 562 | 561 |
| 563 IN_PROC_BROWSER_TEST_F(PicasaDataProviderInvalidateInflightAlbumsIndexerTest, | 562 IN_PROC_BROWSER_TEST_F(PicasaDataProviderInvalidateInflightAlbumsIndexerTest, |
| 564 InvalidateInflightAlbumsIndexerTest) { | 563 InvalidateInflightAlbumsIndexerTest) { |
| 565 RunTest(); | 564 RunTest(); |
| 566 } | 565 } |
| 567 | 566 |
| 568 } // namespace picasa | 567 } // namespace picasa |
| OLD | NEW |