Move chrome/test/data/chromeos/gdata to chrome/test/data/gdata

chrome/browser/google_apis/gdata_wapi_parser_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
@@ skipping 13 matching lines @@
 using base::ListValue;
 
 namespace google_apis {
 
 class GDataWAPIParserTest : public testing::Test {
  protected:
   static DocumentEntry* LoadDocumentEntryFromXml(const std::string& filename) {
     FilePath path;
     std::string error;
     PathService::Get(chrome::DIR_TEST_DATA, &path);
-    path = path.AppendASCII("chromeos")
-        .AppendASCII("gdata")
-        .AppendASCII(filename.c_str());
+    path = path.AppendASCII("gdata").AppendASCII(filename.c_str());

[satorux1, 2012/11/02 04:07:04]

Please use test_util::GetTestFilePath()

[tzik, 2012/11/02 04:28:30]

Done.

     EXPECT_TRUE(file_util::PathExists(path)) <<
         "Couldn't find " << path.value();
     std::string contents;
     EXPECT_TRUE(file_util::ReadFileToString(path, &contents));
     XmlReader reader;
     if (!reader.Load(contents)) {
       NOTREACHED() << "Invalid xml:\n" << contents;
       return NULL;
     }
     scoped_ptr<DocumentEntry> entry;
     while (reader.Read()) {
       if (reader.NodeName() == "entry") {
         entry.reset(DocumentEntry::CreateFromXml(&reader));
         break;
       }
     }
     return entry.release();
   }
 };
 
-// TODO(nhiroki): Make it possible to run these tests on any platforms after
-// 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;
   scoped_ptr<Value> document =
       test_util::LoadJSONFile("gdata/basic_feed.json");
   ASSERT_TRUE(document.get());
   ASSERT_EQ(Value::TYPE_DICTIONARY, document->GetType());
   scoped_ptr<DocumentFeed> feed(DocumentFeed::ExtractAndParse(*document));
   ASSERT_TRUE(feed.get());
 
@@ skipping 259 matching lines @@
   EXPECT_EQ("Drive App 2", UTF16ToUTF8(second_app->app_name()));
   EXPECT_EQ("Drive App Object 2", UTF16ToUTF8(second_app->object_type()));
   EXPECT_EQ("https://chrome.google.com/webstore/detail/deadbeefdeadbeef",
             second_app->GetProductUrl().spec());
   EXPECT_FALSE(second_app->supports_create());
   EXPECT_EQ(2U, second_app->primary_mimetypes().size());
   EXPECT_EQ(0U, second_app->secondary_mimetypes().size());
   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) {
   EXPECT_TRUE(DocumentEntry::HasHostedDocumentExtension(
       FilePath(FILE_PATH_LITERAL("Test.gdoc"))));
   EXPECT_TRUE(DocumentEntry::HasHostedDocumentExtension(
       FilePath(FILE_PATH_LITERAL("Test.gsheet"))));
   EXPECT_TRUE(DocumentEntry::HasHostedDocumentExtension(
       FilePath(FILE_PATH_LITERAL("Test.gslides"))));
   EXPECT_TRUE(DocumentEntry::HasHostedDocumentExtension(
@@ skipping 37 matching lines @@
             DocumentEntry::ClassifyEntryKind(ENTRY_KIND_EXTERNAL_APP));
   EXPECT_EQ(DocumentEntry::KIND_OF_FOLDER,
             DocumentEntry::ClassifyEntryKind(ENTRY_KIND_FOLDER));
   EXPECT_EQ(DocumentEntry::KIND_OF_FILE,
             DocumentEntry::ClassifyEntryKind(ENTRY_KIND_FILE));
   EXPECT_EQ(DocumentEntry::KIND_OF_FILE,
             DocumentEntry::ClassifyEntryKind(ENTRY_KIND_PDF));
 }
 
 }  // namespace google_apis