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

Unified Diff: chrome/browser/google_apis/gdata_wapi_parser_unittest.cc

Issue 10920091: Move Drive API files to google_apis directory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable some tests Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/google_apis/gdata_wapi_parser_unittest.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_wapi_parser_unittest.cc b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc
similarity index 97%
rename from chrome/browser/chromeos/gdata/gdata_wapi_parser_unittest.cc
rename to chrome/browser/google_apis/gdata_wapi_parser_unittest.cc
index d275f95d1178ae7f784577563fb90d5e83e1e065..3e3282e79de1c5729940d91c9faf4a461a17ad65 100644
--- a/chrome/browser/chromeos/gdata/gdata_wapi_parser_unittest.cc
+++ b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc
@@ -2,18 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/gdata/gdata_wapi_parser.h"
+#include "chrome/browser/google_apis/gdata_wapi_parser.h"
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/json/json_file_value_serializer.h"
+#include "base/logging.h"
#include "base/path_service.h"
#include "base/string16.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
-#include "chrome/browser/chromeos/gdata/gdata_test_util.h"
-#include "chrome/browser/chromeos/gdata/gdata_util.h"
+#include "chrome/browser/google_apis/gdata_test_util.h"
+#include "chrome/browser/google_apis/gdata_util.h"
#include "chrome/common/chrome_paths.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/libxml/chromium/libxml_utils.h"
@@ -53,6 +54,9 @@ class GDataWAPIParserTest : public testing::Test {
}
};
+// TODO(satorux): Make it possible to run these tests on any platforms after
satorux1 2012/09/15 05:02:22 TODO(nhiroki)
satorux1 2012/09/15 05:18:59 ditto. please do this in a separate patch.
nhiroki 2012/09/15 07:21:39 I made a separate CL (http://codereview.chromium.o
+// moving json files to out of 'chromeos' directory (http://crbug.com/149788).
+#if defined(OS_CHROMEOS)
// Test document feed parsing.
TEST_F(GDataWAPIParserTest, DocumentFeedJsonParser) {
std::string error;
@@ -332,6 +336,7 @@ TEST_F(GDataWAPIParserTest, AccountMetadataFeedParser) {
EXPECT_EQ(1U, second_app->primary_extensions().size());
EXPECT_EQ(0U, second_app->secondary_extensions().size());
}
+#endif // OS_CHROMEOS
// Test file extension checking in DocumentEntry::HasDocumentExtension().
TEST_F(GDataWAPIParserTest, DocumentEntryHasDocumentExtension) {

Powered by Google App Engine
This is Rietveld 408576698