chrome/browser/google_apis/drive_api_parser_unittest.cc - Issue 10920091: Move Drive API files to google_apis directory

Unified Diff: chrome/browser/google_apis/drive_api_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

« no previous file with comments | « chrome/browser/google_apis/drive_api_parser.cc ('k') | chrome/browser/google_apis/drive_entry_kinds.h » ('j') | chrome/browser/google_apis/drive_service_interface.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/google_apis/drive_api_parser_unittest.cc

diff --git a/chrome/browser/chromeos/gdata/drive_api_parser_unittest.cc b/chrome/browser/google_apis/drive_api_parser_unittest.cc

similarity index 96%

rename from chrome/browser/chromeos/gdata/drive_api_parser_unittest.cc

rename to chrome/browser/google_apis/drive_api_parser_unittest.cc

index ad7a89675e4d3ff5e089bb038b632b64e30a4609..fce957db89e301d4abc94498b4753dbd09c79da5 100644

--- a/chrome/browser/chromeos/gdata/drive_api_parser_unittest.cc

+++ b/chrome/browser/google_apis/drive_api_parser_unittest.cc

@@ -2,7 +2,7 @@

// 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/drive_api_parser.h"

+#include "chrome/browser/google_apis/drive_api_parser.h"

#include "base/file_path.h"

#include "base/file_util.h"

@@ -12,8 +12,8 @@

#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"

@@ -23,6 +23,9 @@ using base::ListValue;

namespace gdata {

+// 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 Please make this change in a separate patch rather

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 about resource parsing.

TEST(DriveAPIParserTest, AboutResourceParser) {

std::string error;

@@ -258,5 +261,6 @@ TEST(DriveAPIParserTest, ChangeListParser) {

EXPECT_FALSE(change3.is_deleted());

EXPECT_EQ(change3.file_id(), change3.file().file_id());

}

+#endif // OS_CHROMEOS

} // namespace gdata