summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/breakpad_mac.mm4
-rw-r--r--chrome/app/chrome_dll_main.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/app/breakpad_mac.mm b/chrome/app/breakpad_mac.mm
index 54d32c0..de14e92 100644
--- a/chrome/app/breakpad_mac.mm
+++ b/chrome/app/breakpad_mac.mm
@@ -15,8 +15,8 @@
#import "base/logging.h"
#include "base/mac_util.h"
#include "base/mac/scoped_cftyperef.h"
+#import "base/mac/scoped_nsautorelease_pool.h"
#include "base/path_service.h"
-#import "base/scoped_nsautorelease_pool.h"
#include "base/sys_string_conversions.h"
#import "breakpad/src/client/mac/Framework/Breakpad.h"
#include "chrome/common/child_process_logging.h"
@@ -46,7 +46,7 @@ void DestructCrashReporter() {
// Only called for a branded build of Chrome.app.
void InitCrashReporter() {
DCHECK(gBreakpadRef == NULL);
- base::ScopedNSAutoreleasePool autorelease_pool;
+ base::mac::ScopedNSAutoreleasePool autorelease_pool;
// Check whether crash reporting should be enabled. If enterprise
// configuration management controls crash reporting, it takes precedence.
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index dad27d8..ca73937 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -39,12 +39,12 @@
#include "base/command_line.h"
#include "base/debug_util.h"
#include "base/i18n/icu_util.h"
+#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/message_loop.h"
#include "base/metrics/stats_counters.h"
#include "base/metrics/stats_table.h"
#include "base/path_service.h"
#include "base/process_util.h"
-#include "base/scoped_nsautorelease_pool.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
@@ -484,7 +484,7 @@ int ChromeMain(int argc, char** argv) {
// event loop, but we don't want to leave them hanging around until the
// app quits. Each "main" needs to flush this pool right before it goes into
// its main event loop to get rid of the cruft.
- base::ScopedNSAutoreleasePool autorelease_pool;
+ base::mac::ScopedNSAutoreleasePool autorelease_pool;
#if defined(OS_CHROMEOS)
chromeos::BootTimesLoader::Get()->SaveChromeMainStats();