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

Side by Side Diff: chrome/test/webdriver/webdriver_capabilities_parser_unittest.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
« no previous file with comments | « chrome/common/safe_browsing/zip_analyzer.cc ('k') | chrome/test/webdriver/webdriver_util.cc » ('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/base64.h" 5 #include "base/base64.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
11 #include "chrome/test/webdriver/webdriver_capabilities_parser.h" 11 #include "chrome/test/webdriver/webdriver_capabilities_parser.h"
12 #include "chrome/test/webdriver/webdriver_logging.h" 12 #include "chrome/test/webdriver/webdriver_logging.h"
13 #include "components/zip/zip.h"
14 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 #include "third_party/zlib/google/zip.h"
15 15
16 using base::DictionaryValue; 16 using base::DictionaryValue;
17 using base::ListValue; 17 using base::ListValue;
18 using base::Value; 18 using base::Value;
19 19
20 namespace webdriver { 20 namespace webdriver {
21 21
22 TEST(CapabilitiesParser, NoCaps) { 22 TEST(CapabilitiesParser, NoCaps) {
23 Capabilities caps; 23 Capabilities caps;
24 DictionaryValue dict; 24 DictionaryValue dict;
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 ASSERT_FALSE(parser.Parse()); 290 ASSERT_FALSE(parser.Parse());
291 291
292 const std::set<std::string>& rm_set = caps.exclude_switches; 292 const std::set<std::string>& rm_set = caps.exclude_switches;
293 EXPECT_EQ(static_cast<size_t>(3), rm_set.size()); 293 EXPECT_EQ(static_cast<size_t>(3), rm_set.size());
294 ASSERT_TRUE(rm_set.find(switches::kNoFirstRun) != rm_set.end()); 294 ASSERT_TRUE(rm_set.find(switches::kNoFirstRun) != rm_set.end());
295 ASSERT_TRUE(rm_set.find(switches::kDisableSync) != rm_set.end()); 295 ASSERT_TRUE(rm_set.find(switches::kDisableSync) != rm_set.end());
296 ASSERT_TRUE(rm_set.find(switches::kDisableTranslate) != rm_set.end()); 296 ASSERT_TRUE(rm_set.find(switches::kDisableTranslate) != rm_set.end());
297 } 297 }
298 298
299 } // namespace webdriver 299 } // namespace webdriver
OLDNEW
« no previous file with comments | « chrome/common/safe_browsing/zip_analyzer.cc ('k') | chrome/test/webdriver/webdriver_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698