diff options
26 files changed, 165 insertions, 53 deletions
diff --git a/base/crypto/rsa_private_key.cc b/base/crypto/rsa_private_key.cc index e8eb2ab..75da7e4 100644 --- a/base/crypto/rsa_private_key.cc +++ b/base/crypto/rsa_private_key.cc @@ -160,6 +160,11 @@ bool PrivateKeyInfoCodec::ReadVersion(uint8** pos, uint8* end) { return true; } +PrivateKeyInfoCodec::PrivateKeyInfoCodec(bool big_endian) + : big_endian_(big_endian) {} + +PrivateKeyInfoCodec::~PrivateKeyInfoCodec() {} + bool PrivateKeyInfoCodec::Export(std::vector<uint8>* output) { std::list<uint8> content; diff --git a/base/crypto/rsa_private_key.h b/base/crypto/rsa_private_key.h index 0349ade..4492c3d 100644 --- a/base/crypto/rsa_private_key.h +++ b/base/crypto/rsa_private_key.h @@ -49,7 +49,9 @@ class PrivateKeyInfoCodec { // that will be parsed & serialized (modulus(), etc...) during Import(), // Export() and ExportPublicKeyInfo() -- not the ASN.1 DER encoding of the // PrivateKeyInfo/PublicKeyInfo (which is always big-endian). - explicit PrivateKeyInfoCodec(bool big_endian) : big_endian_(big_endian) {} + explicit PrivateKeyInfoCodec(bool big_endian); + + ~PrivateKeyInfoCodec(); // Exports the contents of the integer components to the ASN.1 DER encoding // of the PrivateKeyInfo structure to |output|. diff --git a/base/vlog.cc b/base/vlog.cc index d6c3eb7..6075b0b 100644 --- a/base/vlog.cc +++ b/base/vlog.cc @@ -39,6 +39,8 @@ VlogInfo::VlogInfo(const std::string& v_switch, } } +VlogInfo::~VlogInfo() {} + int VlogInfo::GetVlogLevel(const base::StringPiece& file) { if (!vmodule_levels_.empty()) { base::StringPiece module(file); diff --git a/base/vlog.h b/base/vlog.h index faa62ec..d4cffe4 100644 --- a/base/vlog.h +++ b/base/vlog.h @@ -30,6 +30,7 @@ class VlogInfo { // are also disregarded for this matching). VlogInfo(const std::string& v_switch, const std::string& vmodule_switch); + ~VlogInfo(); // Returns the vlog level for a given file (usually taken from // __FILE__). diff --git a/chrome/browser/appcache/view_appcache_internals_job_factory.cc b/chrome/browser/appcache/view_appcache_internals_job_factory.cc index 3f908af..6bd384d 100644 --- a/chrome/browser/appcache/view_appcache_internals_job_factory.cc +++ b/chrome/browser/appcache/view_appcache_internals_job_factory.cc @@ -6,6 +6,7 @@ #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/common/url_constants.h" +#include "net/url_request/url_request.h" #include "webkit/appcache/appcache_service.h" #include "webkit/appcache/view_appcache_internals_job.h" diff --git a/chrome/browser/browser_process.cc b/chrome/browser/browser_process.cc index 5f52499..fa9c092 100644 --- a/chrome/browser/browser_process.cc +++ b/chrome/browser/browser_process.cc @@ -8,6 +8,10 @@ BrowserProcess* g_browser_process = NULL; +BrowserProcess::BrowserProcess() {} + +BrowserProcess::~BrowserProcess() {} + DownloadRequestLimiter* BrowserProcess::download_request_limiter() { ResourceDispatcherHost* rdh = resource_dispatcher_host(); return rdh ? rdh->download_request_limiter() : NULL; diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h index 3293d98..5497932 100644 --- a/chrome/browser/browser_process.h +++ b/chrome/browser/browser_process.h @@ -49,8 +49,8 @@ class IOThread; // These functions shouldn't return NULL unless otherwise noted. class BrowserProcess { public: - BrowserProcess() {} - virtual ~BrowserProcess() {} + BrowserProcess(); + virtual ~BrowserProcess(); // Invoked when the user is logging out/shutting down. When logging off we may // not have enough time to do a normal shutdown. This method is invoked prior diff --git a/chrome/browser/debugger/devtools_netlog_observer.cc b/chrome/browser/debugger/devtools_netlog_observer.cc index a9113b4..1aaf13e 100644 --- a/chrome/browser/debugger/devtools_netlog_observer.cc +++ b/chrome/browser/debugger/devtools_netlog_observer.cc @@ -9,6 +9,7 @@ #include "chrome/common/resource_response.h" #include "net/base/load_flags.h" #include "net/http/http_net_log_params.h" +#include "net/url_request/url_request.h" #include "net/url_request/url_request_netlog_params.h" #include "webkit/glue/resource_loader_bridge.h" diff --git a/chrome/browser/history/history_types.cc b/chrome/browser/history/history_types.cc index 4591130..408bb93 100644 --- a/chrome/browser/history/history_types.cc +++ b/chrome/browser/history/history_types.cc @@ -311,19 +311,29 @@ void QueryOptions::SetRecentDayRange(int days_ago) { // KeywordSearchTermVisit ----------------------------------------------------- -KeywordSearchTermVisit::KeywordSearchTermVisit() { -} +KeywordSearchTermVisit::KeywordSearchTermVisit() {} + +KeywordSearchTermVisit::~KeywordSearchTermVisit() {} + +// MostVisitedURL -------------------------------------------------------------- + +MostVisitedURL::MostVisitedURL() {} -KeywordSearchTermVisit::~KeywordSearchTermVisit() { +MostVisitedURL::MostVisitedURL(const GURL& in_url, + const GURL& in_favicon_url, + const string16& in_title) + : url(in_url), + favicon_url(in_favicon_url), + title(in_title) { } +MostVisitedURL::~MostVisitedURL() {} + // Images --------------------------------------------------------------------- -Images::Images() { -} +Images::Images() {} -Images::~Images() { -} +Images::~Images() {} // HistoryAddPageArgs --------------------------------------------------------- @@ -348,8 +358,7 @@ HistoryAddPageArgs::HistoryAddPageArgs( did_replace_entry(arg_did_replace_entry) { } -HistoryAddPageArgs::~HistoryAddPageArgs() { -} +HistoryAddPageArgs::~HistoryAddPageArgs() {} HistoryAddPageArgs* HistoryAddPageArgs::Clone() const { return new HistoryAddPageArgs( diff --git a/chrome/browser/history/history_types.h b/chrome/browser/history/history_types.h index b479cbc..831c0b0 100644 --- a/chrome/browser/history/history_types.h +++ b/chrome/browser/history/history_types.h @@ -527,6 +527,12 @@ struct KeywordSearchTermVisit { // Holds the per-URL information of the most visited query. struct MostVisitedURL { + MostVisitedURL(); + MostVisitedURL(const GURL& in_url, + const GURL& in_favicon_url, + const string16& in_title); + ~MostVisitedURL(); + GURL url; GURL favicon_url; string16 title; diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc index 0e1ff1f..44e0887 100644 --- a/chrome/browser/history/top_sites.cc +++ b/chrome/browser/history/top_sites.cc @@ -279,11 +279,10 @@ bool TopSites::AddPrepopulatedPages(MostVisitedURLList* urls) { bool added = false; GURL welcome_url(l10n_util::GetStringUTF8(IDS_CHROME_WELCOME_URL)); if (urls->size() < kTopSitesNumber && IndexOf(*urls, welcome_url) == -1) { - MostVisitedURL url = { - welcome_url, - GURL("chrome://theme/IDR_NEWTAB_CHROME_WELCOME_PAGE_FAVICON"), - l10n_util::GetStringUTF16(IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE) - }; + MostVisitedURL url( + welcome_url, + GURL("chrome://theme/IDR_NEWTAB_CHROME_WELCOME_PAGE_FAVICON"), + l10n_util::GetStringUTF16(IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE)); url.redirects.push_back(welcome_url); urls->push_back(url); added = true; @@ -291,11 +290,10 @@ bool TopSites::AddPrepopulatedPages(MostVisitedURLList* urls) { GURL themes_url(l10n_util::GetStringUTF8(IDS_THEMES_GALLERY_URL)); if (urls->size() < kTopSitesNumber && IndexOf(*urls, themes_url) == -1) { - MostVisitedURL url = { - themes_url, - GURL("chrome://theme/IDR_NEWTAB_THEMES_GALLERY_FAVICON"), - l10n_util::GetStringUTF16(IDS_NEW_TAB_THEMES_GALLERY_PAGE_TITLE) - }; + MostVisitedURL url( + themes_url, + GURL("chrome://theme/IDR_NEWTAB_THEMES_GALLERY_FAVICON"), + l10n_util::GetStringUTF16(IDS_NEW_TAB_THEMES_GALLERY_PAGE_TITLE)); url.redirects.push_back(themes_url); urls->push_back(url); added = true; diff --git a/chrome/browser/history/top_sites_unittest.cc b/chrome/browser/history/top_sites_unittest.cc index 77a3465..160b275 100644 --- a/chrome/browser/history/top_sites_unittest.cc +++ b/chrome/browser/history/top_sites_unittest.cc @@ -418,11 +418,11 @@ TEST_F(TopSitesTest, SetPageThumbnail) { TEST_F(TopSitesTest, GetPageThumbnail) { BrowserThread db_loop(BrowserThread::DB, MessageLoop::current()); MostVisitedURLList url_list; - MostVisitedURL url1 = {GURL("http://asdf.com")}; + MostVisitedURL url1(GURL("http://asdf.com"), GURL(), string16()); url1.redirects.push_back(url1.url); url_list.push_back(url1); - MostVisitedURL url2 = {GURL("http://gmail.com")}; + MostVisitedURL url2(GURL("http://gmail.com"), GURL(), string16()); url2.redirects.push_back(url2.url); url2.redirects.push_back(GURL("http://mail.google.com")); url_list.push_back(url2); @@ -1326,7 +1326,7 @@ TEST_F(TopSitesTest, AddPrepopulatedPages) { pages.clear(); - MostVisitedURL url = {themes_url()}; + MostVisitedURL url(themes_url(), GURL(), string16()); pages.push_back(url); top_sites().AddPrepopulatedPages(&pages); diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 0c9b114..8a18541 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -14,6 +14,7 @@ #include "chrome/browser/browser_thread.h" #include "chrome/browser/gpu_process_host.h" #include "chrome/browser/net/chrome_net_log.h" +#include "chrome/browser/net/connect_interceptor.h" #include "chrome/browser/net/predictor_api.h" #include "chrome/browser/net/passive_log_collector.h" #include "chrome/common/chrome_switches.h" @@ -116,6 +117,10 @@ class LoggingNetworkChangeObserver // Quit task. DISABLE_RUNNABLE_METHOD_REFCOUNT(IOThread); +IOThread::Globals::Globals() {} + +IOThread::Globals::~Globals() {} + IOThread::IOThread() : BrowserProcessSubThread(BrowserThread::IO), globals_(NULL), diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h index 9485e0b..79891c9 100644 --- a/chrome/browser/io_thread.h +++ b/chrome/browser/io_thread.h @@ -12,19 +12,19 @@ #include "chrome/browser/browser_process_sub_thread.h" #include "chrome/browser/net/chrome_network_delegate.h" #include "chrome/common/net/predictor_common.h" -#include "chrome/browser/net/connect_interceptor.h" -#include "net/base/host_resolver.h" #include "net/base/network_change_notifier.h" class ChromeNetLog; class ListValue; namespace chrome_browser_net { +class ConnectInterceptor; class Predictor; } // namespace chrome_browser_net namespace net { class DnsRRResolver; +class HostResolver; class HttpAuthHandlerFactory; class URLSecurityManager; } // namespace net @@ -32,6 +32,9 @@ class URLSecurityManager; class IOThread : public BrowserProcessSubThread { public: struct Globals { + Globals(); + ~Globals(); + scoped_ptr<ChromeNetLog> net_log; scoped_ptr<net::HostResolver> host_resolver; scoped_ptr<net::DnsRRResolver> dnsrr_resolver; diff --git a/chrome/browser/net/view_blob_internals_job_factory.cc b/chrome/browser/net/view_blob_internals_job_factory.cc index 25832a0..847d70d 100644 --- a/chrome/browser/net/view_blob_internals_job_factory.cc +++ b/chrome/browser/net/view_blob_internals_job_factory.cc @@ -7,6 +7,7 @@ #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/chrome_blob_storage_context.h" #include "chrome/common/url_constants.h" +#include "net/url_request/url_request.h" #include "webkit/blob/view_blob_internals_job.h" // static. diff --git a/net/net.gyp b/net/net.gyp index 4608733..7aaf9ed 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1208,6 +1208,7 @@ 'sources': [ 'server/http_listen_socket.cc', 'server/http_listen_socket.h', + 'server/http_server_request_info.cc', 'server/http_server_request_info.h', ], }, diff --git a/net/server/http_server_request_info.cc b/net/server/http_server_request_info.cc new file mode 100644 index 0000000..9169f4c --- /dev/null +++ b/net/server/http_server_request_info.cc @@ -0,0 +1,9 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "net/server/http_server_request_info.h" + +HttpServerRequestInfo::HttpServerRequestInfo() {} + +HttpServerRequestInfo::~HttpServerRequestInfo() {} diff --git a/net/server/http_server_request_info.h b/net/server/http_server_request_info.h index 63abab5..27ed5af 100644 --- a/net/server/http_server_request_info.h +++ b/net/server/http_server_request_info.h @@ -15,7 +15,8 @@ // does). class HttpServerRequestInfo { public: - HttpServerRequestInfo() {} + HttpServerRequestInfo(); + ~HttpServerRequestInfo(); // Request method. std::string method; diff --git a/webkit/database/databases_table.cc b/webkit/database/databases_table.cc index 0afede3..fd174ce 100644 --- a/webkit/database/databases_table.cc +++ b/webkit/database/databases_table.cc @@ -10,6 +10,10 @@ namespace webkit_database { +DatabaseDetails::DatabaseDetails() : estimated_size(0) { } + +DatabaseDetails::~DatabaseDetails() {} + bool DatabasesTable::Init() { // 'Databases' schema: // id A unique ID assigned to each database diff --git a/webkit/database/databases_table.h b/webkit/database/databases_table.h index 4443c76..4caab805 100644 --- a/webkit/database/databases_table.h +++ b/webkit/database/databases_table.h @@ -16,7 +16,8 @@ class Connection; namespace webkit_database { struct DatabaseDetails { - DatabaseDetails() : estimated_size(0) { } + DatabaseDetails(); + ~DatabaseDetails(); string16 origin_identifier; string16 database_name; diff --git a/webkit/fileapi/file_system_quota.cc b/webkit/fileapi/file_system_quota.cc index eb69beb..7133082 100644 --- a/webkit/fileapi/file_system_quota.cc +++ b/webkit/fileapi/file_system_quota.cc @@ -13,6 +13,10 @@ namespace fileapi { const int64 FileSystemQuota::kUnknownSize = -1; +FileSystemQuota::FileSystemQuota() {} + +FileSystemQuota::~FileSystemQuota() {} + bool FileSystemQuota::CheckOriginQuota(const GURL& origin, int64) { return CheckIfOriginGrantedUnlimitedQuota(origin); } diff --git a/webkit/fileapi/file_system_quota.h b/webkit/fileapi/file_system_quota.h index 80888ed1..9b77c9b 100644 --- a/webkit/fileapi/file_system_quota.h +++ b/webkit/fileapi/file_system_quota.h @@ -16,9 +16,11 @@ namespace fileapi { // and just allows unlimited quota for apps. class FileSystemQuota { public: - FileSystemQuota() { } static const int64 kUnknownSize; + FileSystemQuota(); + ~FileSystemQuota(); + // Checks if the origin can grow its usage by |growth| bytes. // This only performs in-memory check and returns immediately. // For now it just returns false for any origins (regardless of the size) diff --git a/webkit/glue/plugins/plugin_group_unittest.cc b/webkit/glue/plugins/plugin_group_unittest.cc index a523c73..467c273 100644 --- a/webkit/glue/plugins/plugin_group_unittest.cc +++ b/webkit/glue/plugins/plugin_group_unittest.cc @@ -25,26 +25,21 @@ static const PluginGroupDefinition kPluginDefNotVulnerable = { "myplugin-latest", "MyPlugin", "MyPlugin", "", "", "", "http://latest" }; // name, path, version, desc, mime_types, enabled. -static WebPluginInfo kPlugin2043 = { - ASCIIToUTF16("MyPlugin"), FilePath(), ASCIIToUTF16("2.0.43"), - ASCIIToUTF16("MyPlugin version 2.0.43"), - std::vector<WebPluginMimeType>(), true }; -static WebPluginInfo kPlugin3043 = { - ASCIIToUTF16("MyPlugin"), FilePath(), ASCIIToUTF16("3.0.43"), - ASCIIToUTF16("MyPlugin version 3.0.43"), - std::vector<WebPluginMimeType>(), true }; -static WebPluginInfo kPlugin3044 = { - ASCIIToUTF16("MyPlugin"), FilePath(), ASCIIToUTF16("3.0.44"), - ASCIIToUTF16("MyPlugin version 3.0.44"), - std::vector<WebPluginMimeType>(), true }; -static WebPluginInfo kPlugin3045 = { - ASCIIToUTF16("MyPlugin"), FilePath(), ASCIIToUTF16("3.0.45"), - ASCIIToUTF16("MyPlugin version 3.0.45"), - std::vector<WebPluginMimeType>(), true }; -static WebPluginInfo kPlugin4043 = { - ASCIIToUTF16("MyPlugin"), FilePath(), ASCIIToUTF16("4.0.43"), - ASCIIToUTF16("MyPlugin version 4.0.43"), - std::vector<WebPluginMimeType>(), true }; +static WebPluginInfo kPlugin2043 = WebPluginInfo( + ASCIIToUTF16("MyPlugin"), ASCIIToUTF16("2.0.43"), + ASCIIToUTF16("MyPlugin version 2.0.43")); +static WebPluginInfo kPlugin3043 = WebPluginInfo( + ASCIIToUTF16("MyPlugin"), ASCIIToUTF16("3.0.43"), + ASCIIToUTF16("MyPlugin version 3.0.43")); +static WebPluginInfo kPlugin3044 = WebPluginInfo( + ASCIIToUTF16("MyPlugin"), ASCIIToUTF16("3.0.44"), + ASCIIToUTF16("MyPlugin version 3.0.44")); +static WebPluginInfo kPlugin3045 = WebPluginInfo( + ASCIIToUTF16("MyPlugin"), ASCIIToUTF16("3.0.45"), + ASCIIToUTF16("MyPlugin version 3.0.45")); +static WebPluginInfo kPlugin4043 = WebPluginInfo( + ASCIIToUTF16("MyPlugin"), ASCIIToUTF16("4.0.43"), + ASCIIToUTF16("MyPlugin version 4.0.43")); class PluginGroupTest : public testing::Test { protected: @@ -160,9 +155,8 @@ TEST(PluginGroupTest, VersionExtraction) { }; for (size_t i = 0; i < arraysize(versions); i++) { - const WebPluginInfo plugin = { - ASCIIToUTF16("Blah Plugin"), FilePath(), ASCIIToUTF16(versions[i][0]), - string16(),std::vector<WebPluginMimeType>(), true }; + const WebPluginInfo plugin = WebPluginInfo( + ASCIIToUTF16("Blah Plugin"), ASCIIToUTF16(versions[i][0]), string16()); scoped_ptr<PluginGroup> group(PluginGroup::FromWebPluginInfo(plugin)); EXPECT_TRUE(group->Match(plugin)); group->AddPlugin(plugin, 0); diff --git a/webkit/glue/plugins/webplugininfo.cc b/webkit/glue/plugins/webplugininfo.cc new file mode 100644 index 0000000..7d2b4e4 --- /dev/null +++ b/webkit/glue/plugins/webplugininfo.cc @@ -0,0 +1,44 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "webkit/glue/plugins/webplugininfo.h" + +WebPluginMimeType::WebPluginMimeType() {} + +WebPluginMimeType::~WebPluginMimeType() {} + +WebPluginInfo::WebPluginInfo() : enabled(false) {} + +WebPluginInfo::WebPluginInfo(const WebPluginInfo& rhs) + : name(rhs.name), + path(rhs.path), + version(rhs.version), + desc(rhs.desc), + mime_types(rhs.mime_types), + enabled(rhs.enabled) { +} + +WebPluginInfo::~WebPluginInfo() {} + +WebPluginInfo& WebPluginInfo::operator=(const WebPluginInfo& rhs) { + name = rhs.name; + path = rhs.path; + version = rhs.version; + desc = rhs.desc; + mime_types = rhs.mime_types; + enabled = rhs.enabled; + return *this; +} + +WebPluginInfo::WebPluginInfo(const string16& fake_name, + const string16& fake_version, + const string16& fake_desc) + : name(fake_name), + path(), + version(fake_version), + desc(fake_desc), + mime_types(), + enabled(true) { +} + diff --git a/webkit/glue/plugins/webplugininfo.h b/webkit/glue/plugins/webplugininfo.h index 9d2ab6e..34eff3d 100644 --- a/webkit/glue/plugins/webplugininfo.h +++ b/webkit/glue/plugins/webplugininfo.h @@ -13,6 +13,9 @@ // Describes a mime type entry for a plugin. struct WebPluginMimeType { + WebPluginMimeType(); + ~WebPluginMimeType(); + // The name of the mime type (e.g., "application/x-shockwave-flash"). std::string mime_type; @@ -25,6 +28,16 @@ struct WebPluginMimeType { // Describes an available NPAPI plugin. struct WebPluginInfo { + WebPluginInfo(); + WebPluginInfo(const WebPluginInfo& rhs); + ~WebPluginInfo(); + WebPluginInfo& operator=(const WebPluginInfo& rhs); + + // Special constructor only used during unit testing: + WebPluginInfo(const string16& fake_name, + const string16& fake_version, + const string16& fake_desc); + // The name of the plugin (i.e. Flash). string16 name; diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 48f48d3..e8e1a3e 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -300,6 +300,7 @@ 'plugins/webplugin_delegate_impl_win.cc', 'plugins/webplugin_impl.cc', 'plugins/webplugin_impl.h', + 'plugins/webplugininfo.cc', 'plugins/webplugininfo.h', 'alt_error_page_resource_fetcher.cc', 'alt_error_page_resource_fetcher.h', |