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

Side by Side Diff: chrome/browser/google_apis/drive_api_parser_unittest.cc

Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/google_apis/drive_api_parser.h" 5 #include "chrome/browser/google_apis/drive_api_parser.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/json/json_file_value_serializer.h" 8 #include "base/json/json_file_value_serializer.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/string16.h" 10 #include "base/string16.h"
11 #include "base/strings/utf_string_conversions.h"
11 #include "base/time.h" 12 #include "base/time.h"
12 #include "base/utf_string_conversions.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/browser/google_apis/gdata_wapi_parser.h" 14 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
15 #include "chrome/browser/google_apis/test_util.h" 15 #include "chrome/browser/google_apis/test_util.h"
16 #include "chrome/browser/google_apis/time_util.h" 16 #include "chrome/browser/google_apis/time_util.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 18
19 using base::Value; 19 using base::Value;
20 using base::DictionaryValue; 20 using base::DictionaryValue;
21 using base::ListValue; 21 using base::ListValue;
22 22
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 428
429 EXPECT_TRUE(ChangeList::HasChangeListKind(*change_list_json)); 429 EXPECT_TRUE(ChangeList::HasChangeListKind(*change_list_json));
430 EXPECT_FALSE(ChangeList::HasChangeListKind(*file_list_json)); 430 EXPECT_FALSE(ChangeList::HasChangeListKind(*file_list_json));
431 431
432 EXPECT_FALSE(FileList::HasFileListKind(*change_list_json)); 432 EXPECT_FALSE(FileList::HasFileListKind(*change_list_json));
433 EXPECT_TRUE(FileList::HasFileListKind(*file_list_json)); 433 EXPECT_TRUE(FileList::HasFileListKind(*file_list_json));
434 } 434 }
435 #endif // OS_CHROMEOS 435 #endif // OS_CHROMEOS
436 436
437 } // namespace google_apis 437 } // namespace google_apis
OLDNEW
« no previous file with comments | « chrome/browser/google/google_util_unittest.cc ('k') | chrome/browser/google_apis/drive_api_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698