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

Side by Side Diff: chrome/test/webdriver/webdriver_util.cc

Issue 14021015: Move components/zip to third_party/zip (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update unit_tests.isolate for new test data location 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) 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/test/webdriver/webdriver_util.h" 5 #include "chrome/test/webdriver/webdriver_util.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
11 #include "base/format_macros.h" 11 #include "base/format_macros.h"
12 #include "base/json/json_reader.h" 12 #include "base/json/json_reader.h"
13 #include "base/json/json_writer.h" 13 #include "base/json/json_writer.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/rand_util.h" 15 #include "base/rand_util.h"
16 #include "base/string_util.h" 16 #include "base/string_util.h"
17 #include "base/stringprintf.h" 17 #include "base/stringprintf.h"
18 #include "base/strings/string_number_conversions.h" 18 #include "base/strings/string_number_conversions.h"
19 #include "base/strings/string_split.h" 19 #include "base/strings/string_split.h"
20 #include "base/third_party/icu/icu_utf.h" 20 #include "base/third_party/icu/icu_utf.h"
21 #include "chrome/common/automation_id.h" 21 #include "chrome/common/automation_id.h"
22 #include "chrome/test/automation/automation_json_requests.h" 22 #include "chrome/test/automation/automation_json_requests.h"
23 #include "components/zip/zip.h" 23 #include "third_party/zlib/google/zip.h"
24 24
25 using base::DictionaryValue; 25 using base::DictionaryValue;
26 using base::ListValue; 26 using base::ListValue;
27 using base::Value; 27 using base::Value;
28 28
29 namespace webdriver { 29 namespace webdriver {
30 30
31 SkipParsing* kSkipParsing = NULL; 31 SkipParsing* kSkipParsing = NULL;
32 32
33 std::string GenerateRandomID() { 33 std::string GenerateRandomID() {
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 548
549 bool ValueConversionTraits<webdriver::SkipParsing>::SetFromValue( 549 bool ValueConversionTraits<webdriver::SkipParsing>::SetFromValue(
550 const Value* value, const webdriver::SkipParsing* t) { 550 const Value* value, const webdriver::SkipParsing* t) {
551 return true; 551 return true;
552 } 552 }
553 553
554 bool ValueConversionTraits<webdriver::SkipParsing>::CanConvert( 554 bool ValueConversionTraits<webdriver::SkipParsing>::CanConvert(
555 const Value* value) { 555 const Value* value) {
556 return true; 556 return true;
557 } 557 }
OLDNEW
« no previous file with comments | « chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc ('k') | chrome/unit_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698