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

Side by Side Diff: chrome/browser/extensions/extension_apitest.cc

Issue 1220963005: Update base::StartsWith calls to new form (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@starts_with
Patch Set: Created 5 years, 5 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
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/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/strings/string_split.h" 8 #include "base/strings/string_split.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 23 matching lines...) Expand all
34 34
35 const char kTestCustomArg[] = "customArg"; 35 const char kTestCustomArg[] = "customArg";
36 const char kTestServerPort[] = "testServer.port"; 36 const char kTestServerPort[] = "testServer.port";
37 const char kTestDataDirectory[] = "testDataDirectory"; 37 const char kTestDataDirectory[] = "testDataDirectory";
38 const char kTestWebSocketPort[] = "testWebSocketPort"; 38 const char kTestWebSocketPort[] = "testWebSocketPort";
39 const char kFtpServerPort[] = "ftpServer.port"; 39 const char kFtpServerPort[] = "ftpServer.port";
40 const char kSpawnedTestServerPort[] = "spawnedTestServer.port"; 40 const char kSpawnedTestServerPort[] = "spawnedTestServer.port";
41 41
42 scoped_ptr<net::test_server::HttpResponse> HandleServerRedirectRequest( 42 scoped_ptr<net::test_server::HttpResponse> HandleServerRedirectRequest(
43 const net::test_server::HttpRequest& request) { 43 const net::test_server::HttpRequest& request) {
44 if (!base::StartsWithASCII(request.relative_url, "/server-redirect?", true)) 44 if (!base::StartsWith(request.relative_url, "/server-redirect?",
45 base::CompareCase::SENSITIVE))
45 return nullptr; 46 return nullptr;
46 47
47 size_t query_string_pos = request.relative_url.find('?'); 48 size_t query_string_pos = request.relative_url.find('?');
48 std::string redirect_target = 49 std::string redirect_target =
49 request.relative_url.substr(query_string_pos + 1); 50 request.relative_url.substr(query_string_pos + 1);
50 51
51 scoped_ptr<net::test_server::BasicHttpResponse> http_response( 52 scoped_ptr<net::test_server::BasicHttpResponse> http_response(
52 new net::test_server::BasicHttpResponse); 53 new net::test_server::BasicHttpResponse);
53 http_response->set_code(net::HTTP_MOVED_PERMANENTLY); 54 http_response->set_code(net::HTTP_MOVED_PERMANENTLY);
54 http_response->AddCustomHeader("Location", redirect_target); 55 http_response->AddCustomHeader("Location", redirect_target);
55 return http_response.Pass(); 56 return http_response.Pass();
56 } 57 }
57 58
58 scoped_ptr<net::test_server::HttpResponse> HandleEchoHeaderRequest( 59 scoped_ptr<net::test_server::HttpResponse> HandleEchoHeaderRequest(
59 const net::test_server::HttpRequest& request) { 60 const net::test_server::HttpRequest& request) {
60 if (!base::StartsWithASCII(request.relative_url, "/echoheader?", true)) 61 if (!base::StartsWith(request.relative_url, "/echoheader?",
62 base::CompareCase::SENSITIVE))
61 return nullptr; 63 return nullptr;
62 64
63 size_t query_string_pos = request.relative_url.find('?'); 65 size_t query_string_pos = request.relative_url.find('?');
64 std::string header_name = 66 std::string header_name =
65 request.relative_url.substr(query_string_pos + 1); 67 request.relative_url.substr(query_string_pos + 1);
66 68
67 std::string header_value; 69 std::string header_value;
68 std::map<std::string, std::string>::const_iterator it = request.headers.find( 70 std::map<std::string, std::string>::const_iterator it = request.headers.find(
69 header_name); 71 header_name);
70 if (it != request.headers.end()) 72 if (it != request.headers.end())
71 header_value = it->second; 73 header_value = it->second;
72 74
73 scoped_ptr<net::test_server::BasicHttpResponse> http_response( 75 scoped_ptr<net::test_server::BasicHttpResponse> http_response(
74 new net::test_server::BasicHttpResponse); 76 new net::test_server::BasicHttpResponse);
75 http_response->set_code(net::HTTP_OK); 77 http_response->set_code(net::HTTP_OK);
76 http_response->set_content(header_value); 78 http_response->set_content(header_value);
77 return http_response.Pass(); 79 return http_response.Pass();
78 } 80 }
79 81
80 scoped_ptr<net::test_server::HttpResponse> HandleSetCookieRequest( 82 scoped_ptr<net::test_server::HttpResponse> HandleSetCookieRequest(
81 const net::test_server::HttpRequest& request) { 83 const net::test_server::HttpRequest& request) {
82 if (!base::StartsWithASCII(request.relative_url, "/set-cookie?", true)) 84 if (!base::StartsWith(request.relative_url, "/set-cookie?",
85 base::CompareCase::SENSITIVE))
83 return nullptr; 86 return nullptr;
84 87
85 scoped_ptr<net::test_server::BasicHttpResponse> http_response( 88 scoped_ptr<net::test_server::BasicHttpResponse> http_response(
86 new net::test_server::BasicHttpResponse); 89 new net::test_server::BasicHttpResponse);
87 http_response->set_code(net::HTTP_OK); 90 http_response->set_code(net::HTTP_OK);
88 91
89 size_t query_string_pos = request.relative_url.find('?'); 92 size_t query_string_pos = request.relative_url.find('?');
90 std::string cookie_value = 93 std::string cookie_value =
91 request.relative_url.substr(query_string_pos + 1); 94 request.relative_url.substr(query_string_pos + 1);
92 95
93 std::vector<std::string> cookies; 96 std::vector<std::string> cookies;
94 base::SplitString(cookie_value, '&', &cookies); 97 base::SplitString(cookie_value, '&', &cookies);
95 98
96 for (size_t i = 0; i < cookies.size(); i++) 99 for (size_t i = 0; i < cookies.size(); i++)
97 http_response->AddCustomHeader("Set-Cookie", cookies[i]); 100 http_response->AddCustomHeader("Set-Cookie", cookies[i]);
98 101
99 return http_response.Pass(); 102 return http_response.Pass();
100 } 103 }
101 104
102 scoped_ptr<net::test_server::HttpResponse> HandleSetHeaderRequest( 105 scoped_ptr<net::test_server::HttpResponse> HandleSetHeaderRequest(
103 const net::test_server::HttpRequest& request) { 106 const net::test_server::HttpRequest& request) {
104 if (!base::StartsWithASCII(request.relative_url, "/set-header?", true)) 107 if (!base::StartsWith(request.relative_url, "/set-header?",
108 base::CompareCase::SENSITIVE))
105 return nullptr; 109 return nullptr;
106 110
107 size_t query_string_pos = request.relative_url.find('?'); 111 size_t query_string_pos = request.relative_url.find('?');
108 std::string escaped_header = 112 std::string escaped_header =
109 request.relative_url.substr(query_string_pos + 1); 113 request.relative_url.substr(query_string_pos + 1);
110 114
111 std::string header = 115 std::string header =
112 net::UnescapeURLComponent(escaped_header, 116 net::UnescapeURLComponent(escaped_header,
113 net::UnescapeRule::NORMAL | 117 net::UnescapeRule::NORMAL |
114 net::UnescapeRule::SPACES | 118 net::UnescapeRule::SPACES |
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 } 425 }
422 426
423 void ExtensionApiTest::SetUpCommandLine(base::CommandLine* command_line) { 427 void ExtensionApiTest::SetUpCommandLine(base::CommandLine* command_line) {
424 ExtensionBrowserTest::SetUpCommandLine(command_line); 428 ExtensionBrowserTest::SetUpCommandLine(command_line);
425 test_data_dir_ = test_data_dir_.AppendASCII("api_test"); 429 test_data_dir_ = test_data_dir_.AppendASCII("api_test");
426 // Backgrounded renderer processes run at a lower priority, causing the 430 // Backgrounded renderer processes run at a lower priority, causing the
427 // tests to take more time to complete. Disable backgrounding so that the 431 // tests to take more time to complete. Disable backgrounding so that the
428 // tests don't time out. 432 // tests don't time out.
429 command_line->AppendSwitch(switches::kDisableRendererBackgrounding); 433 command_line->AppendSwitch(switches::kDisableRendererBackgrounding);
430 } 434 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698