Move chrome/browser/cocoa/download_* to chrome/browser/cocoa/download/.

BUG=none
TEST=builds

Review URL: http://codereview.chromium.org/3813008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62903 0039d316-1c4b-4281-b951-d872f2087c98

28 files changed, 77 insertions, 79 deletions

diff --git a/chrome/app/nibs/DownloadItem.xib b/chrome/app/nibs/DownloadItem.xib
index f4b6f08..8c38a8e 100644
--- a/chrome/app/nibs/DownloadItem.xib
+++ b/chrome/app/nibs/DownloadItem.xib
@@ -943,7 +943,7 @@
 					<string key="superclassName">DraggableButton</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">browser/cocoa/download_item_button.h</string>
+						<string key="minorKey">browser/cocoa/download/download_item_button.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -951,7 +951,7 @@
 					<string key="superclassName">GradientButtonCell</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">browser/cocoa/download_item_cell.h</string>
+						<string key="minorKey">browser/cocoa/download/download_item_cell.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -1015,7 +1015,7 @@
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">browser/cocoa/download_item_controller.h</string>
+						<string key="minorKey">browser/cocoa/download/download_item_controller.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
diff --git a/chrome/app/nibs/DownloadShelf.xib b/chrome/app/nibs/DownloadShelf.xib
index 3472c9f..a3b46f4 100644
--- a/chrome/app/nibs/DownloadShelf.xib
+++ b/chrome/app/nibs/DownloadShelf.xib
@@ -531,7 +531,7 @@
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">browser/cocoa/download_shelf_controller.h</string>
+						<string key="minorKey">browser/cocoa/download/download_shelf_controller.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -539,7 +539,7 @@
 					<string key="superclassName">AnimatableView</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">browser/cocoa/download_shelf_view.h</string>
+						<string key="minorKey">browser/cocoa/download/download_shelf_view.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
diff --git a/chrome/app/nibs/MainMenu.xib b/chrome/app/nibs/MainMenu.xib
index 0bb8185..0c45c44 100644
--- a/chrome/app/nibs/MainMenu.xib
+++ b/chrome/app/nibs/MainMenu.xib
@@ -3297,7 +3297,7 @@
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">browser/cocoa/download_shelf_controller.h</string>
+						<string key="minorKey">browser/cocoa/download/download_shelf_controller.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm
index d339e9d..1df0560 100644
--- a/chrome/browser/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/cocoa/browser_window_cocoa.mm
@@ -19,7 +19,7 @@
 #import "chrome/browser/cocoa/clear_browsing_data_controller.h"
 #import "chrome/browser/cocoa/collected_cookies_mac.h"
 #import "chrome/browser/cocoa/content_settings_dialog_controller.h"
-#import "chrome/browser/cocoa/download_shelf_controller.h"
+#import "chrome/browser/cocoa/download/download_shelf_controller.h"
 #import "chrome/browser/cocoa/edit_search_engine_cocoa_controller.h"
 #import "chrome/browser/cocoa/html_dialog_window_controller.h"
 #import "chrome/browser/cocoa/import_settings_dialog.h"
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index 62374ea..632ca8b 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -23,7 +23,7 @@
 #import "chrome/browser/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/cocoa/browser_window_controller_private.h"
 #import "chrome/browser/cocoa/dev_tools_controller.h"
-#import "chrome/browser/cocoa/download_shelf_controller.h"
+#import "chrome/browser/cocoa/download/download_shelf_controller.h"
 #import "chrome/browser/cocoa/event_utils.h"
 #import "chrome/browser/cocoa/fast_resize_view.h"
 #import "chrome/browser/cocoa/find_bar_bridge.h"
diff --git a/chrome/browser/cocoa/download_item_button.h b/chrome/browser/cocoa/download/download_item_button.h
index 2b38399..2b38399 100644
--- a/chrome/browser/cocoa/download_item_button.h
+++ b/chrome/browser/cocoa/download/download_item_button.h
diff --git a/chrome/browser/cocoa/download_item_button.mm b/chrome/browser/cocoa/download/download_item_button.mm
index dd46c53..34ba144 100644
--- a/chrome/browser/cocoa/download_item_button.mm
+++ b/chrome/browser/cocoa/download/download_item_button.mm
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/cocoa/download_item_button.h"
+#import "chrome/browser/cocoa/download/download_item_button.h"
 
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
-#import "chrome/browser/cocoa/download_item_cell.h"
-#import "chrome/browser/cocoa/download_item_controller.h"
+#import "chrome/browser/cocoa/download/download_item_cell.h"
+#import "chrome/browser/cocoa/download/download_item_controller.h"
 
 @implementation DownloadItemButton
 
diff --git a/chrome/browser/cocoa/download_item_button_unittest.mm b/chrome/browser/cocoa/download/download_item_button_unittest.mm
index d5a1b54..a8610a0 100644
--- a/chrome/browser/cocoa/download_item_button_unittest.mm
+++ b/chrome/browser/cocoa/download/download_item_button_unittest.mm
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/scoped_nsobject.h"
-#import "chrome/browser/cocoa/download_item_button.h"
+#import "chrome/browser/cocoa/download/download_item_button.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
diff --git a/chrome/browser/cocoa/download_item_cell.h b/chrome/browser/cocoa/download/download_item_cell.h
index 54d745b..f97e1b8 100644
--- a/chrome/browser/cocoa/download_item_cell.h
+++ b/chrome/browser/cocoa/download/download_item_cell.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_BROWSER_COCOA_DOWNLOAD_ITEM_CELL_H_
-#define CHROME_BROWSER_COCOA_DOWNLOAD_ITEM_CELL_H_
+#ifndef CHROME_BROWSER_COCOA_DOWNLOAD_DOWNLOAD_ITEM_CELL_H_
+#define CHROME_BROWSER_COCOA_DOWNLOAD_DOWNLOAD_ITEM_CELL_H_
 #pragma once
 
 #import "base/cocoa_protocols_mac.h"
@@ -58,5 +58,4 @@ enum DownloadItemMousePosition {
 
 @end
 
-#endif  // CHROME_BROWSER_COCOA_DOWNLOAD_ITEM_CELL_H_
-
+#endif  // CHROME_BROWSER_COCOA_DOWNLOAD_DOWNLOAD_ITEM_CELL_H_
diff --git a/chrome/browser/cocoa/download_item_cell.mm b/chrome/browser/cocoa/download/download_item_cell.mm
index 93687f4..997821a 100644
--- a/chrome/browser/cocoa/download_item_cell.mm
+++ b/chrome/browser/cocoa/download/download_item_cell.mm
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/cocoa/download_item_cell.h"
+#import "chrome/browser/cocoa/download/download_item_cell.h"
 
 #include "app/l10n_util.h"
 #include "app/text_elider.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
-#import "chrome/browser/cocoa/download_item_cell.h"
+#import "chrome/browser/cocoa/download/download_item_cell.h"
 #import "chrome/browser/cocoa/image_utils.h"
 #import "chrome/browser/cocoa/themed_window.h"
 #include "chrome/browser/download/download_item.h"
diff --git a/chrome/browser/cocoa/download_item_controller.h b/chrome/browser/cocoa/download/download_item_controller.h
index 3cf6c8e..dea7722 100644
--- a/chrome/browser/cocoa/download_item_controller.h
+++ b/chrome/browser/cocoa/download/download_item_controller.h
@@ -103,4 +103,3 @@ class DownloadShelfContextMenuMac;
 - (IBAction)handleTogglePause:(id)sender;
 
 @end
-
diff --git a/chrome/browser/cocoa/download_item_controller.mm b/chrome/browser/cocoa/download/download_item_controller.mm
index a5288c2..bfbc7b1 100644
--- a/chrome/browser/cocoa/download_item_controller.mm
+++ b/chrome/browser/cocoa/download/download_item_controller.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/download_item_controller.h"
+#import "chrome/browser/cocoa/download/download_item_controller.h"
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
@@ -13,10 +13,10 @@
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
-#import "chrome/browser/cocoa/download_item_button.h"
-#import "chrome/browser/cocoa/download_item_cell.h"
-#include "chrome/browser/cocoa/download_item_mac.h"
-#import "chrome/browser/cocoa/download_shelf_controller.h"
+#import "chrome/browser/cocoa/download/download_item_button.h"
+#import "chrome/browser/cocoa/download/download_item_cell.h"
+#include "chrome/browser/cocoa/download/download_item_mac.h"
+#import "chrome/browser/cocoa/download/download_shelf_controller.h"
 #import "chrome/browser/cocoa/themed_window.h"
 #import "chrome/browser/cocoa/ui_localizer.h"
 #include "chrome/browser/download/download_item.h"
diff --git a/chrome/browser/cocoa/download_item_mac.h b/chrome/browser/cocoa/download/download_item_mac.h
index 7c2555d..d5f013e 100644
--- a/chrome/browser/cocoa/download_item_mac.h
+++ b/chrome/browser/cocoa/download/download_item_mac.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_BROWSER_COCOA_DOWNLOAD_ITEM_MAC_H_
-#define CHROME_BROWSER_COCOA_DOWNLOAD_ITEM_MAC_H_
+#ifndef CHROME_BROWSER_COCOA_DOWNLOAD_DOWNLOAD_ITEM_MAC_H_
+#define CHROME_BROWSER_COCOA_DOWNLOAD_DOWNLOAD_ITEM_MAC_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -60,4 +60,4 @@ class DownloadItemMac : DownloadItem::Observer {
   DISALLOW_COPY_AND_ASSIGN(DownloadItemMac);
 };
 
-#endif  // CHROME_BROWSER_COCOA_DOWNLOAD_ITEM_MAC_H_
+#endif  // CHROME_BROWSER_COCOA_DOWNLOAD_DOWNLOAD_ITEM_MAC_H_
diff --git a/chrome/browser/cocoa/download_item_mac.mm b/chrome/browser/cocoa/download/download_item_mac.mm
index b2aae2c..b647655 100644
--- a/chrome/browser/cocoa/download_item_mac.mm
+++ b/chrome/browser/cocoa/download/download_item_mac.mm
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/cocoa/download_item_mac.h"
+#include "chrome/browser/cocoa/download/download_item_mac.h"
 
 #include "base/callback.h"
 #include "chrome/browser/browser_process.h"
-#import "chrome/browser/cocoa/download_item_controller.h"
-#include "chrome/browser/cocoa/download_util_mac.h"
+#import "chrome/browser/cocoa/download/download_item_controller.h"
+#include "chrome/browser/cocoa/download/download_util_mac.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "skia/ext/skia_utils_mac.h"
diff --git a/chrome/browser/cocoa/download_shelf_controller.h b/chrome/browser/cocoa/download/download_shelf_controller.h
index 5895cfc..5895cfc 100644
--- a/chrome/browser/cocoa/download_shelf_controller.h
+++ b/chrome/browser/cocoa/download/download_shelf_controller.h
diff --git a/chrome/browser/cocoa/download_shelf_controller.mm b/chrome/browser/cocoa/download/download_shelf_controller.mm
index 715fcfa..121989f 100644
--- a/chrome/browser/cocoa/download_shelf_controller.mm
+++ b/chrome/browser/cocoa/download/download_shelf_controller.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/download_shelf_controller.h"
+#import "chrome/browser/cocoa/download/download_shelf_controller.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ -12,9 +12,9 @@
 #import "chrome/browser/cocoa/animatable_view.h"
 #include "chrome/browser/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
-#include "chrome/browser/cocoa/download_item_controller.h"
-#include "chrome/browser/cocoa/download_shelf_mac.h"
-#import "chrome/browser/cocoa/download_shelf_view.h"
+#include "chrome/browser/cocoa/download/download_item_controller.h"
+#include "chrome/browser/cocoa/download/download_shelf_mac.h"
+#import "chrome/browser/cocoa/download/download_shelf_view.h"
 #import "chrome/browser/cocoa/hyperlink_button_cell.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_manager.h"
diff --git a/chrome/browser/cocoa/download_shelf_mac.h b/chrome/browser/cocoa/download/download_shelf_mac.h
index 462b38f..d7e83a6 100644
--- a/chrome/browser/cocoa/download_shelf_mac.h
+++ b/chrome/browser/cocoa/download/download_shelf_mac.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_DOWNLOAD_SHELF_MAC_H_
-#define CHROME_BROWSER_COCOA_DOWNLOAD_SHELF_MAC_H_
+#ifndef CHROME_BROWSER_COCOA_DOWNLOAD_DOWNLOAD_SHELF_MAC_H_
+#define CHROME_BROWSER_COCOA_DOWNLOAD_DOWNLOAD_SHELF_MAC_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -40,4 +40,4 @@ class DownloadShelfMac : public DownloadShelf {
   DownloadShelfController* shelf_controller_;  // weak, owns us
 };
 
-#endif  // CHROME_BROWSER_COCOA_DOWNLOAD_SHELF_MAC_H_
+#endif  // CHROME_BROWSER_COCOA_DOWNLOAD_DOWNLOAD_SHELF_MAC_H_
diff --git a/chrome/browser/cocoa/download_shelf_mac.mm b/chrome/browser/cocoa/download/download_shelf_mac.mm
index 159ea06..3532ba2 100644
--- a/chrome/browser/cocoa/download_shelf_mac.mm
+++ b/chrome/browser/cocoa/download/download_shelf_mac.mm
@@ -1,12 +1,12 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 "chrome/browser/cocoa/download_shelf_mac.h"
+#include "chrome/browser/cocoa/download/download_shelf_mac.h"
 
 #include "chrome/browser/browser.h"
-#import "chrome/browser/cocoa/download_shelf_controller.h"
-#include "chrome/browser/cocoa/download_item_mac.h"
+#import "chrome/browser/cocoa/download/download_shelf_controller.h"
+#include "chrome/browser/cocoa/download/download_item_mac.h"
 #include "chrome/browser/download/download_item_model.h"
 
 DownloadShelfMac::DownloadShelfMac(Browser* browser,
diff --git a/chrome/browser/cocoa/download_shelf_mac_unittest.mm b/chrome/browser/cocoa/download/download_shelf_mac_unittest.mm
index e9e693d..f6e93ae 100644
--- a/chrome/browser/cocoa/download_shelf_mac_unittest.mm
+++ b/chrome/browser/cocoa/download/download_shelf_mac_unittest.mm
@@ -1,10 +1,10 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 "chrome/browser/cocoa/browser_test_helper.h"
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
-#include "chrome/browser/cocoa/download_shelf_mac.h"
+#include "chrome/browser/cocoa/download/download_shelf_mac.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/chrome/browser/cocoa/download_shelf_view.h b/chrome/browser/cocoa/download/download_shelf_view.h
index c125fdf..0408bb6 100644
--- a/chrome/browser/cocoa/download_shelf_view.h
+++ b/chrome/browser/cocoa/download/download_shelf_view.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_BROWSER_COCOA_SHELF_VIEW_H_
-#define CHROME_BROWSER_COCOA_SHELF_VIEW_H_
+#ifndef CHROME_BROWSER_COCOA_DOWNLOAD_DOWNLOAD_SHELF_VIEW_H_
+#define CHROME_BROWSER_COCOA_DOWNLOAD_DOWNLOAD_SHELF_VIEW_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -17,4 +17,4 @@
 }
 @end
 
-#endif  // CHROME_BROWSER_COCOA_SHELF_VIEW_H_
+#endif  // CHROME_BROWSER_COCOA_DOWNLOAD_DOWNLOAD_SHELF_VIEW_H_
diff --git a/chrome/browser/cocoa/download_shelf_view.mm b/chrome/browser/cocoa/download/download_shelf_view.mm
index b382037..ba327286 100644
--- a/chrome/browser/cocoa/download_shelf_view.mm
+++ b/chrome/browser/cocoa/download/download_shelf_view.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/download_shelf_view.h"
+#import "chrome/browser/cocoa/download/download_shelf_view.h"
 
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/themed_window.h"
diff --git a/chrome/browser/cocoa/download_shelf_view_unittest.mm b/chrome/browser/cocoa/download/download_shelf_view_unittest.mm
index 3fc015a..2f4a730 100644
--- a/chrome/browser/cocoa/download_shelf_view_unittest.mm
+++ b/chrome/browser/cocoa/download/download_shelf_view_unittest.mm
@@ -4,7 +4,7 @@
 
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/cocoa/download_shelf_view.h"
+#import "chrome/browser/cocoa/download/download_shelf_view.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/chrome/browser/cocoa/download_started_animation_mac.mm b/chrome/browser/cocoa/download/download_started_animation_mac.mm
index 0ed926b..0ed926b 100644
--- a/chrome/browser/cocoa/download_started_animation_mac.mm
+++ b/chrome/browser/cocoa/download/download_started_animation_mac.mm
diff --git a/chrome/browser/cocoa/download_util_mac.h b/chrome/browser/cocoa/download/download_util_mac.h
index f71810f..30ca42a 100644
--- a/chrome/browser/cocoa/download_util_mac.h
+++ b/chrome/browser/cocoa/download/download_util_mac.h
@@ -4,8 +4,8 @@
 //
 // Download utility functions for Mac OS X.
 
-#ifndef CHROME_BROWSER_COCOA_DOWNLOAD_UTIL_MAC_H_
-#define CHROME_BROWSER_COCOA_DOWNLOAD_UTIL_MAC_H_
+#ifndef CHROME_BROWSER_COCOA_DOWNLOAD_DOWNLOAD_UTIL_MAC_H_
+#define CHROME_BROWSER_COCOA_DOWNLOAD_DOWNLOAD_UTIL_MAC_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -22,4 +22,4 @@ void NotifySystemOfDownloadComplete(const FilePath& path);
 
 }  // namespace download_util
 
-#endif  // CHROME_BROWSER_COCOA_DOWNLOAD_UTIL_MAC_H_
+#endif  // CHROME_BROWSER_COCOA_DOWNLOAD_DOWNLOAD_UTIL_MAC_H_
diff --git a/chrome/browser/cocoa/download_util_mac.mm b/chrome/browser/cocoa/download/download_util_mac.mm
index 9364520..486406f 100644
--- a/chrome/browser/cocoa/download_util_mac.mm
+++ b/chrome/browser/cocoa/download/download_util_mac.mm
@@ -1,10 +1,10 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 //
 // Download utility implementation for Mac OS X.
 
-#include "chrome/browser/cocoa/download_util_mac.h"
+#include "chrome/browser/cocoa/download/download_util_mac.h"
 
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/dock_icon.h"
diff --git a/chrome/browser/cocoa/download_util_mac_unittest.mm b/chrome/browser/cocoa/download/download_util_mac_unittest.mm
index 88d6097..a6b0939 100644
--- a/chrome/browser/cocoa/download_util_mac_unittest.mm
+++ b/chrome/browser/cocoa/download/download_util_mac_unittest.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,7 +7,7 @@
 #include "base/path_service.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/cocoa/download_util_mac.h"
+#import "chrome/browser/cocoa/download/download_util_mac.h"
 #include "chrome/common/chrome_paths.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index e7e772a..cef59c2 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -910,23 +910,23 @@
         'browser/cocoa/dev_tools_controller.mm',
         'browser/cocoa/dock_icon.h',
         'browser/cocoa/dock_icon.mm',
-        'browser/cocoa/download_item_button.h',
-        'browser/cocoa/download_item_button.mm',
-        'browser/cocoa/download_item_cell.h',
-        'browser/cocoa/download_item_cell.mm',
-        'browser/cocoa/download_item_controller.h',
-        'browser/cocoa/download_item_controller.mm',
-        'browser/cocoa/download_item_mac.h',
-        'browser/cocoa/download_item_mac.mm',
-        'browser/cocoa/download_shelf_controller.h',
-        'browser/cocoa/download_shelf_controller.mm',
-        'browser/cocoa/download_shelf_mac.h',
-        'browser/cocoa/download_shelf_mac.mm',
-        'browser/cocoa/download_shelf_view.h',
-        'browser/cocoa/download_shelf_view.mm',
-        'browser/cocoa/download_started_animation_mac.mm',
-        'browser/cocoa/download_util_mac.h',
-        'browser/cocoa/download_util_mac.mm',
+        'browser/cocoa/download/download_item_button.h',
+        'browser/cocoa/download/download_item_button.mm',
+        'browser/cocoa/download/download_item_cell.h',
+        'browser/cocoa/download/download_item_cell.mm',
+        'browser/cocoa/download/download_item_controller.h',
+        'browser/cocoa/download/download_item_controller.mm',
+        'browser/cocoa/download/download_item_mac.h',
+        'browser/cocoa/download/download_item_mac.mm',
+        'browser/cocoa/download/download_shelf_controller.h',
+        'browser/cocoa/download/download_shelf_controller.mm',
+        'browser/cocoa/download/download_shelf_mac.h',
+        'browser/cocoa/download/download_shelf_mac.mm',
+        'browser/cocoa/download/download_shelf_view.h',
+        'browser/cocoa/download/download_shelf_view.mm',
+        'browser/cocoa/download/download_started_animation_mac.mm',
+        'browser/cocoa/download/download_util_mac.h',
+        'browser/cocoa/download/download_util_mac.mm',
         'browser/cocoa/draggable_button.h',
         'browser/cocoa/draggable_button.mm',
         'browser/cocoa/edit_search_engine_cocoa_controller.h',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 2fa3101..03677f0 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1134,10 +1134,10 @@
         'browser/cocoa/cookie_details_view_controller_unittest.mm',
         'browser/cocoa/custom_home_pages_model_unittest.mm',
         'browser/cocoa/delayedmenu_button_unittest.mm',
-        'browser/cocoa/download_item_button_unittest.mm',
-        'browser/cocoa/download_shelf_mac_unittest.mm',
-        'browser/cocoa/download_shelf_view_unittest.mm',
-        'browser/cocoa/download_util_mac_unittest.mm',
+        'browser/cocoa/download/download_item_button_unittest.mm',
+        'browser/cocoa/download/download_shelf_mac_unittest.mm',
+        'browser/cocoa/download/download_shelf_view_unittest.mm',
+        'browser/cocoa/download/download_util_mac_unittest.mm',
         'browser/cocoa/draggable_button_unittest.mm',
         'browser/cocoa/edit_search_engine_cocoa_controller_unittest.mm',
         'browser/cocoa/event_utils_unittest.mm',