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

chrome/browser/google_apis/gdata_test_util.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_test_util.h"
 
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ skipping 23 matching lines @@
 
  private:
   bool posted_;
   DISALLOW_COPY_AND_ASSIGN(TaskObserver);
 };
 
 FilePath GetTestFilePath(const std::string& relative_path) {
   FilePath path;
   std::string error;
   PathService::Get(chrome::DIR_TEST_DATA, &path);
-  path = path.AppendASCII("chromeos")
-      .Append(FilePath::FromUTF8Unsafe(relative_path));
+  path = path.Append(FilePath::FromUTF8Unsafe(relative_path));
   EXPECT_TRUE(file_util::PathExists(path)) <<
       "Couldn't find " << path.value();
   return path;
 }
 
 void RunBlockingPoolTask() {
   while (true) {
     content::BrowserThread::GetBlockingPool()->FlushForTesting();
 
     TaskObserver task_observer;
@@ skipping 12 matching lines @@
   std::string error;
   JSONFileValueSerializer serializer(path);
   scoped_ptr<base::Value> value(serializer.Deserialize(NULL, &error));
   EXPECT_TRUE(value.get()) <<
       "Parse error " << path.value() << ": " << error;
   return value.Pass();
 }
 
 }  // namespace test_util
 }  // namespace google_apis