OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <sstream> | 5 #include <sstream> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
9 #include "base/id_map.h" | 9 #include "base/id_map.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
241 url = GURL(url_string); | 241 url = GURL(url_string); |
242 if (url.is_valid()) { | 242 if (url.is_valid()) { |
243 requests.push_back(new ContentExtractionRequest(url)); | 243 requests.push_back(new ContentExtractionRequest(url)); |
244 if (command_line.HasSwitch(kOriginalUrl)) { | 244 if (command_line.HasSwitch(kOriginalUrl)) { |
245 (*file_to_url_map)[url.spec()] = | 245 (*file_to_url_map)[url.spec()] = |
246 command_line.GetSwitchValueASCII(kOriginalUrl); | 246 command_line.GetSwitchValueASCII(kOriginalUrl); |
247 } | 247 } |
248 } | 248 } |
249 } else if (command_line.HasSwitch(kUrlsSwitch)) { | 249 } else if (command_line.HasSwitch(kUrlsSwitch)) { |
250 std::string urls_string = command_line.GetSwitchValueASCII(kUrlsSwitch); | 250 std::string urls_string = command_line.GetSwitchValueASCII(kUrlsSwitch); |
251 std::vector<std::string> urls; | 251 std::vector<std::string> urls = base::SplitString( |
252 base::SplitString(urls_string, ' ', &urls); | 252 urls_string, " ", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL); |
yzshen1
2015/07/22 22:50:34
TRIM_WHITESPACE
| |
253 // Check for original-urls switch, which must exactly pair up with | 253 // Check for original-urls switch, which must exactly pair up with |
254 // |kUrlsSwitch| i.e. number of original urls must be same as that of | 254 // |kUrlsSwitch| i.e. number of original urls must be same as that of |
255 // urls. | 255 // urls. |
256 std::vector<std::string> original_urls; | 256 std::vector<std::string> original_urls; |
257 if (command_line.HasSwitch(kOriginalUrls)) { | 257 if (command_line.HasSwitch(kOriginalUrls)) { |
258 std::string original_urls_string = | 258 std::string original_urls_string = |
259 command_line.GetSwitchValueASCII(kOriginalUrls); | 259 command_line.GetSwitchValueASCII(kOriginalUrls); |
260 base::SplitString(original_urls_string, ' ', &original_urls); | 260 original_urls = base::SplitString( |
261 if (original_urls.size() != urls.size()) original_urls.clear(); | 261 original_urls_string, " ", |
262 base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL); | |
yzshen1
2015/07/22 22:50:34
TRIM_WHITESPACE
| |
263 if (original_urls.size() != urls.size()) | |
264 original_urls.clear(); | |
262 } | 265 } |
263 for (size_t i = 0; i < urls.size(); ++i) { | 266 for (size_t i = 0; i < urls.size(); ++i) { |
264 GURL url(urls[i]); | 267 GURL url(urls[i]); |
265 if (url.is_valid()) { | 268 if (url.is_valid()) { |
266 requests.push_back(new ContentExtractionRequest(url)); | 269 requests.push_back(new ContentExtractionRequest(url)); |
267 // Only regard non-empty original urls. | 270 // Only regard non-empty original urls. |
268 if (!original_urls.empty() && !original_urls[i].empty()) { | 271 if (!original_urls.empty() && !original_urls[i].empty()) { |
269 (*file_to_url_map)[url.spec()] = original_urls[i]; | 272 (*file_to_url_map)[url.spec()] = original_urls[i]; |
270 } | 273 } |
271 } else { | 274 } else { |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
417 scoped_ptr<google::protobuf::io::StringOutputStream> protobuf_output_stream_; | 420 scoped_ptr<google::protobuf::io::StringOutputStream> protobuf_output_stream_; |
418 }; | 421 }; |
419 | 422 |
420 IN_PROC_BROWSER_TEST_F(ContentExtractor, MANUAL_ExtractUrl) { | 423 IN_PROC_BROWSER_TEST_F(ContentExtractor, MANUAL_ExtractUrl) { |
421 SetDistillerJavaScriptWorldId(content::ISOLATED_WORLD_ID_CONTENT_END); | 424 SetDistillerJavaScriptWorldId(content::ISOLATED_WORLD_ID_CONTENT_END); |
422 Start(); | 425 Start(); |
423 base::RunLoop().Run(); | 426 base::RunLoop().Run(); |
424 } | 427 } |
425 | 428 |
426 } // namespace dom_distiller | 429 } // namespace dom_distiller |
OLD | NEW |