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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10920091: Move Drive API files to google_apis directory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Reflect comments 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/google_apis/gdata_test_util.h ('k') | chrome/browser/google_apis/gdata_util.h » ('j') | no next file with comments »

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_test_util.h"	5 #include "chrome/browser/google_apis/gdata_test_util.h"

6	6

7 #include "base/file_util.h"	7 #include "base/file_util.h"

8 #include "base/json/json_file_value_serializer.h"	8 #include "base/json/json_file_value_serializer.h"

9 #include "base/message_loop.h"	9 #include "base/message_loop.h"

10 #include "base/path_service.h"	10 #include "base/path_service.h"

11 #include "base/threading/sequenced_worker_pool.h"	11 #include "base/threading/sequenced_worker_pool.h"

12 #include "chrome/common/chrome_paths.h"	12 #include "chrome/common/chrome_paths.h"

13 #include "content/public/browser/browser_thread.h"	13 #include "content/public/browser/browser_thread.h"

14 #include "testing/gtest/include/gtest/gtest.h"	14 #include "testing/gtest/include/gtest/gtest.h"

15	15

(...skipping 52 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
68 std::string error;	68 std::string error;

69 JSONFileValueSerializer serializer(path);	69 JSONFileValueSerializer serializer(path);

70 scoped_ptr<base::Value> value(serializer.Deserialize(NULL, &error));	70 scoped_ptr<base::Value> value(serializer.Deserialize(NULL, &error));

71 EXPECT_TRUE(value.get()) <<	71 EXPECT_TRUE(value.get()) <<

72 "Parse error " << path.value() << ": " << error;	72 "Parse error " << path.value() << ": " << error;

73 return value.Pass();	73 return value.Pass();

74 }	74 }

75	75

76 } // namespace test_util	76 } // namespace test_util

77 } // namespace gdata	77 } // namespace gdata

OLD	NEW