diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-05 12:31:02 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-05 12:31:02 +0000 |
| commit | 7e242b5aae22d77d2447c11041e7b01c49d133c3 (patch) | |
| tree | 3015e7cac08f39c4ba66d53f4485a257ca3cd9d7 /chrome/browser/cache_manager_host.cc | |
| parent | 9193185e11c562ad867007376f71ef9cefc08b17 (diff) | |
| download | chromium_src-7e242b5aae22d77d2447c11041e7b01c49d133c3.zip chromium_src-7e242b5aae22d77d2447c11041e7b01c49d133c3.tar.gz chromium_src-7e242b5aae22d77d2447c11041e7b01c49d133c3.tar.bz2 | |
Usual round of porting in chrome/
- make following unit tests run and pass on Linux:
browser/cache_manager_host_unittest.cc
browser/google_url_tracker_unittest.cc
- trivial cleanups needed for GCC
- remove CacheManagerHost and ResolveProxyMsgHelper from temporary scaffolding stubs and use real implementations instead
- update chrome.xcodeproj to reflect above change
Review URL: http://codereview.chromium.org/20057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cache_manager_host.cc')
| -rw-r--r-- | chrome/browser/cache_manager_host.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/cache_manager_host.cc b/chrome/browser/cache_manager_host.cc index 38db812..4423184 100644 --- a/chrome/browser/cache_manager_host.cc +++ b/chrome/browser/cache_manager_host.cc @@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <algorithm> - #include "chrome/browser/cache_manager_host.h" +#include <algorithm> + +#include "base/compiler_specific.h" #include "base/sys_info.h" #include "base/time.h" #include "chrome/browser/browser_process.h" @@ -54,8 +55,7 @@ CacheManagerHost* CacheManagerHost::GetInstance() { CacheManagerHost::CacheManagerHost() : global_size_limit_(GetDefaultGlobalSizeLimit()), -#pragma warning(suppress: 4355) // Okay to pass "this" here. - revise_allocation_factory_(this) { + ALLOW_THIS_IN_INITIALIZER_LIST(revise_allocation_factory_(this)) { } CacheManagerHost::~CacheManagerHost() { |