Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/gdata/gdata_wapi_parser.h" | 5 #include "chrome/browser/google_apis/gdata_wapi_parser.h" |
| 6 | 6 |
| 7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/json/json_file_value_serializer.h" | 9 #include "base/json/json_file_value_serializer.h" |
| 10 #include "base/logging.h" | |
|
satorux1
2012/09/16 15:46:33
why did you add this? when moving files, please re
nhiroki
2012/09/16 16:12:56
NOTREACHED macro (line 43) is defined in logging.h
nhiroki
2012/09/16 16:42:02
I made the patch http://codereview.chromium.org/10
| |
| 10 #include "base/path_service.h" | 11 #include "base/path_service.h" |
| 11 #include "base/string16.h" | 12 #include "base/string16.h" |
| 12 #include "base/time.h" | 13 #include "base/time.h" |
| 13 #include "base/utf_string_conversions.h" | 14 #include "base/utf_string_conversions.h" |
| 14 #include "base/values.h" | 15 #include "base/values.h" |
| 15 #include "chrome/browser/chromeos/gdata/gdata_test_util.h" | 16 #include "chrome/browser/google_apis/gdata_test_util.h" |
| 16 #include "chrome/browser/chromeos/gdata/gdata_util.h" | 17 #include "chrome/browser/google_apis/gdata_util.h" |
| 17 #include "chrome/common/chrome_paths.h" | 18 #include "chrome/common/chrome_paths.h" |
| 18 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
| 19 #include "third_party/libxml/chromium/libxml_utils.h" | 20 #include "third_party/libxml/chromium/libxml_utils.h" |
| 20 | 21 |
| 21 using base::Value; | 22 using base::Value; |
| 22 using base::DictionaryValue; | 23 using base::DictionaryValue; |
| 23 using base::ListValue; | 24 using base::ListValue; |
| 24 | 25 |
| 25 namespace gdata { | 26 namespace gdata { |
| 26 | 27 |
| (...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 386 DocumentEntry::ClassifyEntryKind(ENTRY_KIND_EXTERNAL_APP)); | 387 DocumentEntry::ClassifyEntryKind(ENTRY_KIND_EXTERNAL_APP)); |
| 387 EXPECT_EQ(DocumentEntry::KIND_OF_FOLDER, | 388 EXPECT_EQ(DocumentEntry::KIND_OF_FOLDER, |
| 388 DocumentEntry::ClassifyEntryKind(ENTRY_KIND_FOLDER)); | 389 DocumentEntry::ClassifyEntryKind(ENTRY_KIND_FOLDER)); |
| 389 EXPECT_EQ(DocumentEntry::KIND_OF_FILE, | 390 EXPECT_EQ(DocumentEntry::KIND_OF_FILE, |
| 390 DocumentEntry::ClassifyEntryKind(ENTRY_KIND_FILE)); | 391 DocumentEntry::ClassifyEntryKind(ENTRY_KIND_FILE)); |
| 391 EXPECT_EQ(DocumentEntry::KIND_OF_FILE, | 392 EXPECT_EQ(DocumentEntry::KIND_OF_FILE, |
| 392 DocumentEntry::ClassifyEntryKind(ENTRY_KIND_PDF)); | 393 DocumentEntry::ClassifyEntryKind(ENTRY_KIND_PDF)); |
| 393 } | 394 } |
| 394 | 395 |
| 395 } // namespace gdata | 396 } // namespace gdata |
| OLD | NEW |