23 files changed, 51 insertions, 51 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 1e438fc..61e4030 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -187,7 +187,7 @@
 #if defined(OS_MACOSX)
 #include <Security/Security.h>
 
-#include "chrome/browser/cocoa/install_from_dmg.h"
+#include "chrome/browser/mac/install_from_dmg.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
diff --git a/chrome/browser/browser_main_mac.mm b/chrome/browser/browser_main_mac.mm
index cfd5ebd..c5e9ab5 100644
--- a/chrome/browser/browser_main_mac.mm
+++ b/chrome/browser/browser_main_mac.mm
@@ -17,7 +17,7 @@
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/browser_main_win.h"
 #import "chrome/browser/chrome_browser_application_mac.h"
-#import "chrome/browser/cocoa/keystone_glue.h"
+#import "chrome/browser/mac/keystone_glue.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/download/base_file.cc b/chrome/browser/download/base_file.cc
index 7ea96b5..e52f08a 100644
--- a/chrome/browser/download/base_file.cc
+++ b/chrome/browser/download/base_file.cc
@@ -18,7 +18,7 @@
 #if defined(OS_WIN)
 #include "chrome/common/win_safe_util.h"
 #elif defined(OS_MACOSX)
-#include "chrome/browser/cocoa/file_metadata.h"
+#include "chrome/browser/mac/file_metadata.h"
 #endif
 
 BaseFile::BaseFile(const FilePath& full_path,
diff --git a/chrome/browser/cocoa/OWNERS b/chrome/browser/mac/OWNERS
index c56e89d..c56e89d 100644
--- a/chrome/browser/cocoa/OWNERS
+++ b/chrome/browser/mac/OWNERS
diff --git a/chrome/browser/cocoa/authorization_util.h b/chrome/browser/mac/authorization_util.h
index 52ebcf5..c25f0cb 100644
--- a/chrome/browser/cocoa/authorization_util.h
+++ b/chrome/browser/mac/authorization_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_COCOA_AUTHORIZATION_UTIL_H_
-#define CHROME_BROWSER_COCOA_AUTHORIZATION_UTIL_H_
+#ifndef CHROME_BROWSER_MAC_AUTHORIZATION_UTIL_H_
+#define CHROME_BROWSER_MAC_AUTHORIZATION_UTIL_H_
 #pragma once
 
 // AuthorizationExecuteWithPrivileges fork()s and exec()s the tool, but it
@@ -64,4 +64,4 @@ OSStatus ExecuteWithPrivilegesAndWait(AuthorizationRef authorization,
 
 }  // namespace authorization_util
 
-#endif  // CHROME_BROWSER_COCOA_AUTHORIZATION_UTIL_H_
+#endif  // CHROME_BROWSER_MAC_AUTHORIZATION_UTIL_H_
diff --git a/chrome/browser/cocoa/authorization_util.mm b/chrome/browser/mac/authorization_util.mm
index 81e9d4c..4db58b9 100644
--- a/chrome/browser/cocoa/authorization_util.mm
+++ b/chrome/browser/mac/authorization_util.mm
@@ -1,8 +1,8 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "chrome/browser/cocoa/authorization_util.h"
+#include "chrome/browser/mac/authorization_util.h"
 
 #import <Foundation/Foundation.h>
 #include <sys/wait.h>
@@ -15,7 +15,7 @@
 #import "base/mac/mac_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
-#include "chrome/browser/cocoa/scoped_authorizationref.h"
+#include "chrome/browser/mac/scoped_authorizationref.h"
 
 namespace authorization_util {
 
diff --git a/chrome/browser/cocoa/file_metadata.h b/chrome/browser/mac/file_metadata.h
index e7448d7..17a59e8 100644
--- a/chrome/browser/cocoa/file_metadata.h
+++ b/chrome/browser/mac/file_metadata.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-#ifndef CHROME_BROWSER_COCOA_FILE_METADATA_H_
-#define CHROME_BROWSER_COCOA_FILE_METADATA_H_
+#ifndef CHROME_BROWSER_MAC_FILE_METADATA_H_
+#define CHROME_BROWSER_MAC_FILE_METADATA_H_
 #pragma once
 
 class FilePath;
@@ -26,4 +26,4 @@ void AddQuarantineMetadataToFile(const FilePath& file, const GURL& source,
 
 }  // namespace file_metadata
 
-#endif  // CHROME_BROWSER_COCOA_FILE_METADATA_H_
+#endif  // CHROME_BROWSER_MAC_FILE_METADATA_H_
diff --git a/chrome/browser/cocoa/file_metadata.mm b/chrome/browser/mac/file_metadata.mm
index e484682..2775259 100644
--- a/chrome/browser/cocoa/file_metadata.mm
+++ b/chrome/browser/mac/file_metadata.mm
@@ -1,8 +1,8 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "chrome/browser/cocoa/file_metadata.h"
+#include "chrome/browser/mac/file_metadata.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 #include <Foundation/Foundation.h>
diff --git a/chrome/browser/ui/cocoa/install.sh b/chrome/browser/mac/install.sh
index dc73fae..6cf110e 100755
--- a/chrome/browser/ui/cocoa/install.sh
+++ b/chrome/browser/mac/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -p
 
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 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.
 
@@ -23,7 +23,7 @@ set -e
 export PATH="/usr/bin:/usr/sbin:/bin:/sbin"
 
 # If running as root, output the pid to stdout before doing anything else.
-# See chrome/browser/cocoa/authorization_util.h.
+# See chrome/browser/mac/authorization_util.h.
 if [ ${EUID} -eq 0 ] ; then
   echo "${$}"
 fi
diff --git a/chrome/browser/cocoa/install_from_dmg.h b/chrome/browser/mac/install_from_dmg.h
index ec9248a..34d66d5 100644
--- a/chrome/browser/cocoa/install_from_dmg.h
+++ b/chrome/browser/mac/install_from_dmg.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-#ifndef CHROME_BROWSER_COCOA_INSTALL_FROM_DMG_H_
-#define CHROME_BROWSER_COCOA_INSTALL_FROM_DMG_H_
+#ifndef CHROME_BROWSER_MAC_INSTALL_FROM_DMG_H_
+#define CHROME_BROWSER_MAC_INSTALL_FROM_DMG_H_
 #pragma once
 
 // If the application is running from a read-only disk image, prompts the user
@@ -12,4 +12,4 @@
 // true.  In that case, the caller must exit expeditiously.
 bool MaybeInstallFromDiskImage();
 
-#endif  // CHROME_BROWSER_COCOA_INSTALL_FROM_DMG_H_
+#endif  // CHROME_BROWSER_MAC_INSTALL_FROM_DMG_H_
diff --git a/chrome/browser/cocoa/install_from_dmg.mm b/chrome/browser/mac/install_from_dmg.mm
index 1c56927..4361f5f 100644
--- a/chrome/browser/cocoa/install_from_dmg.mm
+++ b/chrome/browser/mac/install_from_dmg.mm
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "chrome/browser/cocoa/install_from_dmg.h"
+#include "chrome/browser/mac/install_from_dmg.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 #import <AppKit/AppKit.h>
@@ -18,9 +18,9 @@
 #include "base/logging.h"
 #import "base/mac/mac_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
-#include "chrome/browser/cocoa/authorization_util.h"
-#include "chrome/browser/cocoa/scoped_authorizationref.h"
-#import "chrome/browser/cocoa/keystone_glue.h"
+#include "chrome/browser/mac/authorization_util.h"
+#include "chrome/browser/mac/scoped_authorizationref.h"
+#import "chrome/browser/mac/keystone_glue.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/cocoa/keystone_glue.h b/chrome/browser/mac/keystone_glue.h
index 117fafb..58b5705 100644
--- a/chrome/browser/cocoa/keystone_glue.h
+++ b/chrome/browser/mac/keystone_glue.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_COCOA_KEYSTONE_GLUE_H_
-#define CHROME_BROWSER_COCOA_KEYSTONE_GLUE_H_
+#ifndef CHROME_BROWSER_MAC_KEYSTONE_GLUE_H_
+#define CHROME_BROWSER_MAC_KEYSTONE_GLUE_H_
 #pragma once
 
 #include "base/string16.h"
@@ -13,7 +13,7 @@
 #import <Foundation/Foundation.h>
 
 #import "base/memory/scoped_nsobject.h"
-#include "chrome/browser/cocoa/scoped_authorizationref.h"
+#include "chrome/browser/mac/scoped_authorizationref.h"
 
 // Possible outcomes of various operations.  A version may accompany some of
 // these, but beware: a version is never required.  For statuses that can be
@@ -206,4 +206,4 @@ string16 CurrentlyInstalledVersion();
 
 }  // namespace keystone_glue
 
-#endif  // CHROME_BROWSER_COCOA_KEYSTONE_GLUE_H_
+#endif  // CHROME_BROWSER_MAC_KEYSTONE_GLUE_H_
diff --git a/chrome/browser/cocoa/keystone_glue.mm b/chrome/browser/mac/keystone_glue.mm
index ba2e25a..ec84eab 100644
--- a/chrome/browser/cocoa/keystone_glue.mm
+++ b/chrome/browser/mac/keystone_glue.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/cocoa/keystone_glue.h"
+#import "chrome/browser/mac/keystone_glue.h"
 
 #include <sys/param.h>
 #include <sys/mount.h>
@@ -16,8 +16,8 @@
 #include "base/sys_string_conversions.h"
 #include "base/task.h"
 #include "base/threading/worker_pool.h"
-#include "chrome/browser/cocoa/authorization_util.h"
-#import "chrome/browser/cocoa/keystone_registration.h"
+#include "chrome/browser/mac/authorization_util.h"
+#import "chrome/browser/mac/keystone_registration.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/cocoa/keystone_glue_unittest.mm b/chrome/browser/mac/keystone_glue_unittest.mm
index 134fac2..5b9c2ca0 100644
--- a/chrome/browser/cocoa/keystone_glue_unittest.mm
+++ b/chrome/browser/mac/keystone_glue_unittest.mm
@@ -5,8 +5,8 @@
 #import <Foundation/Foundation.h>
 #import <objc/objc-class.h>
 
-#import "chrome/browser/cocoa/keystone_glue.h"
-#import "chrome/browser/cocoa/keystone_registration.h"
+#import "chrome/browser/mac/keystone_glue.h"
+#import "chrome/browser/mac/keystone_registration.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/chrome/browser/ui/cocoa/keystone_promote_postflight.sh b/chrome/browser/mac/keystone_promote_postflight.sh
index 44799f8..6344cd3 100755
--- a/chrome/browser/ui/cocoa/keystone_promote_postflight.sh
+++ b/chrome/browser/mac/keystone_promote_postflight.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -p
 
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 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.
 
@@ -25,7 +25,7 @@ set -e
 export PATH="/usr/bin:/usr/sbin:/bin:/sbin"
 
 # Output the pid to stdout before doing anything else.  See
-# chrome/browser/ui/cocoa/authorization_util.h.
+# chrome/browser/mac/authorization_util.h.
 echo "${$}"
 
 if [ ${#} -ne 1 ] ; then
diff --git a/chrome/browser/ui/cocoa/keystone_promote_preflight.sh b/chrome/browser/mac/keystone_promote_preflight.sh
index 4bf31e8..e054ff0 100755
--- a/chrome/browser/ui/cocoa/keystone_promote_preflight.sh
+++ b/chrome/browser/mac/keystone_promote_preflight.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -p
 
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 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.
 
@@ -26,7 +26,7 @@ set -e
 export PATH="/usr/bin:/usr/sbin:/bin:/sbin"
 
 # Output the pid to stdout before doing anything else.  See
-# chrome/browser/cocoa/authorization_util.h.
+# chrome/browser/mac/authorization_util.h.
 echo "${$}"
 
 if [ ${#} -ne 0 ] && [ ${#} -ne 2 ] ; then
diff --git a/chrome/browser/cocoa/keystone_registration.h b/chrome/browser/mac/keystone_registration.h
index 9f56c64..4d0e0cf 100644
--- a/chrome/browser/cocoa/keystone_registration.h
+++ b/chrome/browser/mac/keystone_registration.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_COCOA_KEYSTONE_REGISTRATION_H_
-#define CHROME_BROWSER_COCOA_KEYSTONE_REGISTRATION_H_
+#ifndef CHROME_BROWSER_MAC_KEYSTONE_REGISTRATION_H_
+#define CHROME_BROWSER_MAC_KEYSTONE_REGISTRATION_H_
 #pragma once
 
 #import <Foundation/Foundation.h>
@@ -69,4 +69,4 @@ extern NSString* KSRegistrationRemoveExistingTag;
 
 @end  // @interface KSRegistration
 
-#endif  // CHROME_BROWSER_COCOA_KEYSTONE_REGISTRATION_H_
+#endif  // CHROME_BROWSER_MAC_KEYSTONE_REGISTRATION_H_
diff --git a/chrome/browser/cocoa/keystone_registration.mm b/chrome/browser/mac/keystone_registration.mm
index 306001b..779ec94 100644
--- a/chrome/browser/cocoa/keystone_registration.mm
+++ b/chrome/browser/mac/keystone_registration.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/cocoa/keystone_registration.h"
+#import "chrome/browser/mac/keystone_registration.h"
 
 namespace keystone_registration {
 
diff --git a/chrome/browser/cocoa/scoped_authorizationref.h b/chrome/browser/mac/scoped_authorizationref.h
index 3ffa18b..2a4c6fe 100644
--- a/chrome/browser/cocoa/scoped_authorizationref.h
+++ b/chrome/browser/mac/scoped_authorizationref.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-#ifndef CHROME_BROWSER_COCOA_SCOPED_AUTHORIZATIONREF_H_
-#define CHROME_BROWSER_COCOA_SCOPED_AUTHORIZATIONREF_H_
+#ifndef CHROME_BROWSER_MAC_SCOPED_AUTHORIZATIONREF_H_
+#define CHROME_BROWSER_MAC_SCOPED_AUTHORIZATIONREF_H_
 #pragma once
 
 #include <Security/Authorization.h>
@@ -77,4 +77,4 @@ class scoped_AuthorizationRef {
   DISALLOW_COPY_AND_ASSIGN(scoped_AuthorizationRef);
 };
 
-#endif  // CHROME_BROWSER_COCOA_SCOPED_AUTHORIZATIONREF_H_
+#endif  // CHROME_BROWSER_MAC_SCOPED_AUTHORIZATIONREF_H_
diff --git a/chrome/browser/ui/cocoa/about_window_controller.mm b/chrome/browser/ui/cocoa/about_window_controller.mm
index 0909acf..0e73b57 100644
--- a/chrome/browser/ui/cocoa/about_window_controller.mm
+++ b/chrome/browser/ui/cocoa/about_window_controller.mm
@@ -9,8 +9,8 @@
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
-#import "chrome/browser/cocoa/keystone_glue.h"
 #include "chrome/browser/google/google_util.h"
+#import "chrome/browser/mac/keystone_glue.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/cocoa/about_window_controller_unittest.mm b/chrome/browser/ui/cocoa/about_window_controller_unittest.mm
index 2baf249..639b46b 100644
--- a/chrome/browser/ui/cocoa/about_window_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/about_window_controller_unittest.mm
@@ -5,7 +5,7 @@
 #import <Cocoa/Cocoa.h>
 
 #import "base/memory/scoped_nsobject.h"
-#import "chrome/browser/cocoa/keystone_glue.h"
+#import "chrome/browser/mac/keystone_glue.h"
 #import "chrome/browser/ui/cocoa/about_window_controller.h"
 #include "chrome/browser/ui/cocoa/browser_test_helper.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
diff --git a/chrome/browser/ui/cocoa/keystone_infobar.mm b/chrome/browser/ui/cocoa/keystone_infobar.mm
index bb49f27..86935f8 100644
--- a/chrome/browser/ui/cocoa/keystone_infobar.mm
+++ b/chrome/browser/ui/cocoa/keystone_infobar.mm
@@ -11,8 +11,8 @@
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/task.h"
-#import "chrome/browser/cocoa/keystone_glue.h"
 #include "chrome/browser/first_run/first_run.h"
+#import "chrome/browser/mac/keystone_glue.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
diff --git a/chrome/browser/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector_impl.cc
index 23f747a..fd551ee 100644
--- a/chrome/browser/upgrade_detector_impl.cc
+++ b/chrome/browser/upgrade_detector_impl.cc
@@ -24,7 +24,7 @@
 #if defined(OS_WIN)
 #include "chrome/installer/util/install_util.h"
 #elif defined(OS_MACOSX)
-#include "chrome/browser/cocoa/keystone_glue.h"
+#include "chrome/browser/mac/keystone_glue.h"
 #elif defined(OS_POSIX)
 #include "base/process_util.h"
 #include "base/version.h"