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

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

Issue 14971002: GTTF: move chrome/browser/google_apis/test_server to net/test (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased, OWNERS Created 7 years, 7 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/base_operations.h" 5 #include "chrome/browser/google_apis/base_operations.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/google_apis/operation_registry.h" 12 #include "chrome/browser/google_apis/operation_registry.h"
13 #include "chrome/browser/google_apis/operation_runner.h" 13 #include "chrome/browser/google_apis/operation_runner.h"
14 #include "chrome/browser/google_apis/task_util.h" 14 #include "chrome/browser/google_apis/task_util.h"
15 #include "chrome/browser/google_apis/test_server/http_request.h"
16 #include "chrome/browser/google_apis/test_server/http_response.h"
17 #include "chrome/browser/google_apis/test_server/http_server.h"
18 #include "chrome/browser/google_apis/test_util.h" 15 #include "chrome/browser/google_apis/test_util.h"
19 #include "chrome/test/base/testing_profile.h" 16 #include "chrome/test/base/testing_profile.h"
20 #include "content/public/test/test_browser_thread.h" 17 #include "content/public/test/test_browser_thread.h"
18 #include "net/test/embedded_test_server/http_request.h"
19 #include "net/test/embedded_test_server/http_response.h"
20 #include "net/test/embedded_test_server/http_server.h"
21 #include "net/url_request/url_request_test_util.h" 21 #include "net/url_request/url_request_test_util.h"
22 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
23 23
24 namespace google_apis { 24 namespace google_apis {
25 25
26 namespace { 26 namespace {
27 27
28 const char kTestAuthToken[] = "testtoken"; 28 const char kTestAuthToken[] = "testtoken";
29 const char kTestUserAgent[] = "test-user-agent"; 29 const char kTestUserAgent[] = "test-user-agent";
30 30
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 file_util::Delete(temp_file, false); 141 file_util::Delete(temp_file, false);
142 142
143 EXPECT_EQ(HTTP_NOT_FOUND, result_code); 143 EXPECT_EQ(HTTP_NOT_FOUND, result_code);
144 EXPECT_EQ(test_server::METHOD_GET, http_request_.method); 144 EXPECT_EQ(test_server::METHOD_GET, http_request_.method);
145 EXPECT_EQ("/files/chromeos/gdata/no-such-file.txt", 145 EXPECT_EQ("/files/chromeos/gdata/no-such-file.txt",
146 http_request_.relative_url); 146 http_request_.relative_url);
147 // Do not verify the not found message. 147 // Do not verify the not found message.
148 } 148 }
149 149
150 } // namespace google_apis 150 } // namespace google_apis
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698