diff options
| -rw-r--r-- | base/singleton.h | 2 | ||||
| -rw-r--r-- | net/base/mime_util.cc | 2 | ||||
| -rw-r--r-- | net/base/mime_util_unittest.cc | 4 | ||||
| -rw-r--r-- | net/net.xcodeproj/project.pbxproj | 6 |
4 files changed, 10 insertions, 4 deletions
diff --git a/base/singleton.h b/base/singleton.h index b7c03ec..b1e1e5a 100644 --- a/base/singleton.h +++ b/base/singleton.h @@ -106,7 +106,7 @@ struct DefaultSingletonTraits { // void Bar() { ... } // private: // FooClass() { ... } -// friend DefaultSingletonTraits<FooClass>; +// friend struct DefaultSingletonTraits<FooClass>; // // DISALLOW_EVIL_CONSTRUCTORS(FooClass); // }; diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index 9e98145..78037ce 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -63,7 +63,7 @@ class MimeUtil : public PlatformMimeUtil { const std::string &mime_type) const; private: - friend DefaultSingletonTraits<MimeUtil>; + friend struct DefaultSingletonTraits<MimeUtil>; MimeUtil() { InitializeMimeTypeMaps(); } diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc index 548601a..4d2f53d 100644 --- a/net/base/mime_util_unittest.cc +++ b/net/base/mime_util_unittest.cc @@ -52,7 +52,7 @@ TEST(MimeUtilTest, ExtensionTest) { std::string mime_type; bool rv; - for (size_t i = 0; i < arraysize(tests); ++i) { + for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) { rv = net::GetMimeTypeFromExtension(tests[i].extension, &mime_type); EXPECT_EQ(rv, tests[i].valid); if (rv) @@ -77,7 +77,7 @@ TEST(MimeUtilTest, FileTest) { std::string mime_type; bool rv; - for (size_t i = 0; i < arraysize(tests); ++i) { + for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) { rv = net::GetMimeTypeFromFile(tests[i].file_path, &mime_type); EXPECT_EQ(rv, tests[i].valid); if (rv) diff --git a/net/net.xcodeproj/project.pbxproj b/net/net.xcodeproj/project.pbxproj index e4a736d..9389da0 100644 --- a/net/net.xcodeproj/project.pbxproj +++ b/net/net.xcodeproj/project.pbxproj @@ -22,6 +22,9 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 048268070E5B3B1000A30786 /* mime_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32AA0E5A181C00A747DB /* mime_util.cc */; }; + 048268080E5B3B3200A30786 /* http_chunked_decoder_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED33570E5A194700A747DB /* http_chunked_decoder_unittest.cc */; }; + 048268090E5B3B4800A30786 /* mime_util_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED325E0E5A181C00A747DB /* mime_util_unittest.cc */; }; 7B8502040E5A376900730B43 /* libgoogleurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8501FE0E5A372500730B43 /* libgoogleurl.a */; }; 7B8502050E5A377100730B43 /* auth_cache_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32790E5A181C00A747DB /* auth_cache_unittest.cc */; }; 7B8502120E5A37A800730B43 /* base64_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32760E5A181C00A747DB /* base64_unittest.cc */; }; @@ -1173,6 +1176,7 @@ 7B8504330E5B2E4900730B43 /* mem_backend_impl.cc in Sources */, 7B8504340E5B2E4900730B43 /* mem_entry_impl.cc in Sources */, 7B8504350E5B2E4900730B43 /* mem_rankings.cc in Sources */, + 048268070E5B3B1000A30786 /* mime_util.cc in Sources */, 7BA015550E5A1C1000044150 /* net_errors.cc in Sources */, 7B8504390E5B2E5700730B43 /* net_module.cc in Sources */, 7B85043B0E5B2E6400730B43 /* os_file_posix.cc in Sources */, @@ -1194,6 +1198,8 @@ 7B8502120E5A37A800730B43 /* base64_unittest.cc in Sources */, 7BA015210E5A1B9800044150 /* bzip2_filter_unittest.cc in Sources */, 7BA0151F0E5A1B9200044150 /* gzip_filter_unittest.cc in Sources */, + 048268080E5B3B3200A30786 /* http_chunked_decoder_unittest.cc in Sources */, + 048268090E5B3B4800A30786 /* mime_util_unittest.cc in Sources */, E4AFA6430E5241B400201347 /* run_all_unittests.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; |