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

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

Issue 10920091: Move Drive API files to google_apis directory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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_util_unittest.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_util_unittest.cc b/chrome/browser/google_apis/gdata_util_unittest.cc
similarity index 94%
rename from chrome/browser/chromeos/gdata/gdata_util_unittest.cc
rename to chrome/browser/google_apis/gdata_util_unittest.cc
index 2fbbf6fb22d4c295efc187f4d3debc4cb97c2060..a4801046a522ea4a4459d9282670570e7d464d89 100644
--- a/chrome/browser/chromeos/gdata/gdata_util_unittest.cc
+++ b/chrome/browser/google_apis/gdata_util_unittest.cc
@@ -2,14 +2,17 @@
// 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_util.h"
+#include "chrome/browser/google_apis/gdata_util.h"
#include "base/i18n/time_formatting.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/system/timezone_settings.h"
#include "testing/gtest/include/gtest/gtest.h"
+#if defined(CHROMEOS)
yoshiki 2012/09/10 05:34:50 It is better to use "OS_CHROMEOS" rather than "CHR
nhiroki 2012/09/10 07:17:39 Done in the separate patch (http://codereview.chro
+#include "chrome/browser/chromeos/system/timezone_settings.h"
+#endif
+
namespace gdata {
namespace util {
namespace {
@@ -20,6 +23,8 @@ std::string FormatTime(const base::Time& time) {
} // namespace
+// TODO(yoshiki): Find platform independent way to get/set local timezone.
+#if defined(CHROMEOS)
yoshiki 2012/09/10 05:34:50 ditto
nhiroki 2012/09/10 07:17:39 Done in the separate patch (http://codereview.chro
TEST(GDataUtilTest, GetTimeFromStringLocalTimezone) {
// Creates time object GMT.
base::Time::Exploded exploded = {2012, 7, 0, 14, 1, 3, 21, 151};
@@ -85,6 +90,7 @@ TEST(GDataUtilTest, GetTimeFromString) {
EXPECT_EQ(FormatTime(base::Time::FromUTCExploded(target_time3)),
FormatTime(test_time));
}
+#endif
TEST(GDataUtilTest, FormatTimeAsString) {
base::Time::Exploded exploded_time = {2012, 7, 0, 19, 15, 59, 13, 123};

Powered by Google App Engine
This is Rietveld 408576698