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

Side by Side Diff: ui/base/resource/data_pack_unittest.cc

Issue 7575017: Revert 95480 - Abstract fullscreen exit bubble logic to bring Linux's behaviour in line with (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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 | « ui/base/resource/data_pack.cc ('k') | ui/base/test/data/data_pack_unittest/sample.pak » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/file_path.h" 5 #include "base/file_path.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/scoped_temp_dir.h" 8 #include "base/scoped_temp_dir.h"
9 #include "base/string_piece.h" 9 #include "base/string_piece.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 30 matching lines...) Expand all
41 ScopedTempDir dir; 41 ScopedTempDir dir;
42 ASSERT_TRUE(dir.CreateUniqueTempDir()); 42 ASSERT_TRUE(dir.CreateUniqueTempDir());
43 FilePath file = dir.path().Append(FILE_PATH_LITERAL("data.pak")); 43 FilePath file = dir.path().Append(FILE_PATH_LITERAL("data.pak"));
44 44
45 std::string one("one"); 45 std::string one("one");
46 std::string two("two"); 46 std::string two("two");
47 std::string three("three"); 47 std::string three("three");
48 std::string four("four"); 48 std::string four("four");
49 std::string fifteen("fifteen"); 49 std::string fifteen("fifteen");
50 50
51 std::map<uint16, base::StringPiece> resources; 51 std::map<uint32, base::StringPiece> resources;
52 resources.insert(std::make_pair(1, base::StringPiece(one))); 52 resources.insert(std::make_pair(1, base::StringPiece(one)));
53 resources.insert(std::make_pair(2, base::StringPiece(two))); 53 resources.insert(std::make_pair(2, base::StringPiece(two)));
54 resources.insert(std::make_pair(15, base::StringPiece(fifteen))); 54 resources.insert(std::make_pair(15, base::StringPiece(fifteen)));
55 resources.insert(std::make_pair(3, base::StringPiece(three))); 55 resources.insert(std::make_pair(3, base::StringPiece(three)));
56 resources.insert(std::make_pair(4, base::StringPiece(four))); 56 resources.insert(std::make_pair(4, base::StringPiece(four)));
57 ASSERT_TRUE(DataPack::WritePack(file, resources)); 57 ASSERT_TRUE(DataPack::WritePack(file, resources));
58 58
59 // Now try to read the data back in. 59 // Now try to read the data back in.
60 DataPack pack; 60 DataPack pack;
61 ASSERT_TRUE(pack.Load(file)); 61 ASSERT_TRUE(pack.Load(file));
62 62
63 base::StringPiece data; 63 base::StringPiece data;
64 ASSERT_TRUE(pack.GetStringPiece(1, &data)); 64 ASSERT_TRUE(pack.GetStringPiece(1, &data));
65 EXPECT_EQ(one, data); 65 EXPECT_EQ(one, data);
66 ASSERT_TRUE(pack.GetStringPiece(2, &data)); 66 ASSERT_TRUE(pack.GetStringPiece(2, &data));
67 EXPECT_EQ(two, data); 67 EXPECT_EQ(two, data);
68 ASSERT_TRUE(pack.GetStringPiece(3, &data)); 68 ASSERT_TRUE(pack.GetStringPiece(3, &data));
69 EXPECT_EQ(three, data); 69 EXPECT_EQ(three, data);
70 ASSERT_TRUE(pack.GetStringPiece(4, &data)); 70 ASSERT_TRUE(pack.GetStringPiece(4, &data));
71 EXPECT_EQ(four, data); 71 EXPECT_EQ(four, data);
72 ASSERT_TRUE(pack.GetStringPiece(15, &data)); 72 ASSERT_TRUE(pack.GetStringPiece(15, &data));
73 EXPECT_EQ(fifteen, data); 73 EXPECT_EQ(fifteen, data);
74 } 74 }
75 75
76 } // namespace ui 76 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/resource/data_pack.cc ('k') | ui/base/test/data/data_pack_unittest/sample.pak » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698