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

Side by Side Diff: chrome/browser/chromeos/gdata/gdata_documents_service_browsertest.cc

Issue 10836011: Revert 148990 - gdrive: Get JSON feeds parsing off the UI thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | « no previous file | chrome/browser/chromeos/gdata/gdata_operations.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
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_reader.h" 9 #include "base/json/json_reader.h"
10 #include "chrome/browser/chromeos/gdata/gdata_documents_service.h" 10 #include "chrome/browser/chromeos/gdata/gdata_documents_service.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/test/base/in_process_browser_test.h" 13 #include "chrome/test/base/in_process_browser_test.h"
14 #include "chrome/test/base/ui_test_utils.h" 14 #include "chrome/test/base/ui_test_utils.h"
15 #include "net/test/test_server.h" 15 #include "net/test/test_server.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 17
18 namespace gdata {
19
20 namespace { 18 namespace {
21 19
22 class GDataTest : public InProcessBrowserTest { 20 class GDataTest : public InProcessBrowserTest {
23 public: 21 public:
24 GDataTest() 22 GDataTest()
25 : InProcessBrowserTest(), 23 : InProcessBrowserTest(),
26 gdata_test_server_(net::TestServer::TYPE_GDATA, 24 gdata_test_server_(net::TestServer::TYPE_GDATA,
27 net::TestServer::kLocalhost, 25 net::TestServer::kLocalhost,
28 FilePath(FILE_PATH_LITERAL("chrome/test/data"))) { 26 FilePath(FILE_PATH_LITERAL("chrome/test/data"))) {
29 } 27 }
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 gdata_test_server_.GetURL("files/chromeos/gdata/testfile.txt"), 137 gdata_test_server_.GetURL("files/chromeos/gdata/testfile.txt"),
140 0, // start_changestamp 138 0, // start_changestamp
141 std::string(), // search string 139 std::string(), // search string
142 std::string(), // directory resource ID 140 std::string(), // directory resource ID
143 base::Bind(&TestGetDocumentsCallback, &result, &result_data)); 141 base::Bind(&TestGetDocumentsCallback, &result, &result_data));
144 content::RunMessageLoop(); 142 content::RunMessageLoop();
145 143
146 EXPECT_EQ(gdata::GDATA_PARSE_ERROR, result); 144 EXPECT_EQ(gdata::GDATA_PARSE_ERROR, result);
147 EXPECT_FALSE(result_data); 145 EXPECT_FALSE(result_data);
148 } 146 }
149
150 } // namespace gdata
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/gdata/gdata_operations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698