Assorted cleanup.

process: grep for TODO(port), find cruft, clean it up

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

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

15 files changed, 34 insertions, 61 deletions

diff --git a/chrome/browser/automation/automation_provider_list.h b/chrome/browser/automation/automation_provider_list.h
index 4e4ca86..058dc34 100644
--- a/chrome/browser/automation/automation_provider_list.h
+++ b/chrome/browser/automation/automation_provider_list.h
@@ -1,8 +1,9 @@
 // Copyright (c) 2006-2008 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_AUTOMATION_AUTOMATION_PROVIDER_LIST_H__
-#define CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_LIST_H__
+
+#ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_LIST_H_
+#define CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_LIST_H_
 
 #include <vector>
 #include "base/basictypes.h"
@@ -41,7 +42,7 @@ class AutomationProviderList {
   list_type automation_providers_;
   static AutomationProviderList* instance_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(AutomationProviderList);
+  DISALLOW_COPY_AND_ASSIGN(AutomationProviderList);
 };
 
-#endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_LIST_H__
+#endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_LIST_H_
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 6ede0da..94126da 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -34,6 +34,7 @@
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/browser/first_run.h"
+#include "chrome/browser/jankometer.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/net/metadata_url_request.h"
@@ -96,7 +97,6 @@
 #include "base/win_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_trial.h"
-#include "chrome/browser/jankometer.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 80d6d57..49993fb 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -36,14 +36,14 @@
 #include "ipc/ipc_logging.h"
 
 #if defined(OS_WIN)
-#include "chrome/browser/automation/automation_provider_list.h"
-#include "chrome/browser/printing/print_job_manager.h"
 #include "views/focus/view_storage.h"
-#elif defined(OS_MACOSX)
-#include "chrome/browser/printing/print_job_manager.h"
-#elif defined(OS_LINUX)
-// TODO(port): Remove the temporary scaffolding as we port the above headers.
+#endif
+
+#if defined(OS_LINUX)
+// TODO(port): get rid of this.
 #include "chrome/common/temp_scaffolding_stubs.h"
+#else
+#include "chrome/browser/printing/print_job_manager.h"
 #endif
 
 #if defined(IPC_MESSAGE_LOG_ENABLED)
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index c8bc6d9..3d1bbcd 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -23,8 +23,6 @@
 
 #if defined(OS_WIN)
 #include "sandbox/src/sandbox.h"
-#else
-#include "chrome/common/temp_scaffolding_stubs.h"
 #endif
 
 class CommandLine;
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
index f91a18c..fc3f429 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -482,8 +482,9 @@ void RenderWidgetHostViewGtk::UpdateCursor(const WebCursor& cursor) {
   // However, we can switch between different pixmaps, so only on the
   // non-pixmap branch.
   if (current_cursor_.GetCursorType() != GDK_CURSOR_IS_PIXMAP &&
-      current_cursor_.GetCursorType() == cursor.GetCursorType())
+      current_cursor_.GetCursorType() == cursor.GetCursorType()) {
     return;
+  }
 
   current_cursor_ = cursor;
   ShowCurrentCursor();
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
index 3432eb1..3b0f99e 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
@@ -41,6 +41,7 @@
 #include "chrome/browser/renderer_host/safe_browsing_resource_handler.h"
 #include "chrome/browser/renderer_host/save_file_resource_handler.h"
 #include "chrome/browser/renderer_host/sync_resource_handler.h"
+#include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/ssl/ssl_client_auth_handler.h"
 #include "chrome/browser/ssl/ssl_manager.h"
 #include "chrome/browser/worker_host/worker_service.h"
@@ -58,14 +59,6 @@
 #include "webkit/appcache/appcache_interceptor.h"
 #include "webkit/appcache/appcache_interfaces.h"
 
-// TODO(port): Move these includes to the above section when porting is done.
-#if defined(OS_POSIX)
-#include "chrome/common/temp_scaffolding_stubs.h"
-#elif defined(OS_WIN)
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
-#endif
-
-
 // Uncomment to enable logging of request traffic.
 // #define LOG_RESOURCE_DISPATCHER_REQUESTS
 
diff --git a/chrome/browser/tab_contents/web_drag_source.cc b/chrome/browser/tab_contents/web_drag_source_win.cc
index 8c8b65f..9934e82 100644
--- a/chrome/browser/tab_contents/web_drag_source.cc
+++ b/chrome/browser/tab_contents/web_drag_source_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/tab_contents/web_drag_source.h"
+#include "chrome/browser/tab_contents/web_drag_source_win.h"
 
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ -16,16 +16,11 @@ namespace {
 
 static void GetCursorPositions(gfx::NativeWindow wnd, gfx::Point* client,
                                gfx::Point* screen) {
-#if defined(OS_WIN)
   POINT cursor_pos;
   GetCursorPos(&cursor_pos);
   screen->SetPoint(cursor_pos.x, cursor_pos.y);
   ScreenToClient(wnd, &cursor_pos);
   client->SetPoint(cursor_pos.x, cursor_pos.y);
-#else
-  // TODO(port): Get the cursor positions.
-  NOTIMPLEMENTED();
-#endif
 }
 
 }  // namespace
diff --git a/chrome/browser/tab_contents/web_drag_source.h b/chrome/browser/tab_contents/web_drag_source_win.h
index 597e087..da20372 100644
--- a/chrome/browser/tab_contents/web_drag_source.h
+++ b/chrome/browser/tab_contents/web_drag_source_win.h
@@ -2,22 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_TAB_CONTENTS_WEB_DRAG_SOURCE_H_
-#define CHROME_BROWSER_TAB_CONTENTS_WEB_DRAG_SOURCE_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_WEB_DRAG_SOURCE_WIN_H_
+#define CHROME_BROWSER_TAB_CONTENTS_WEB_DRAG_SOURCE_WIN_H_
 
 #include "app/gfx/native_widget_types.h"
+#include "base/base_drag_source.h"
 #include "base/basictypes.h"
 #include "base/gfx/point.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 
-// TODO(port): Port this file.
-#if defined(OS_WIN)
-#include "base/base_drag_source.h"
-#else
-#include "chrome/common/temp_scaffolding_stubs.h"
-#endif
-
 class RenderViewHost;
 class TabContents;
 
@@ -65,4 +59,4 @@ class WebDragSource : public BaseDragSource,
   DISALLOW_COPY_AND_ASSIGN(WebDragSource);
 };
 
-#endif  // CHROME_BROWSER_TAB_CONTENTS_WEB_DRAG_SOURCE_H_
+#endif  // CHROME_BROWSER_TAB_CONTENTS_WEB_DRAG_SOURCE_WIN_H_
diff --git a/chrome/browser/tab_contents/web_drop_target.cc b/chrome/browser/tab_contents/web_drop_target_win.cc
index 259e8ba..ed2c7c6 100644
--- a/chrome/browser/tab_contents/web_drop_target.cc
+++ b/chrome/browser/tab_contents/web_drop_target_win.cc
@@ -5,7 +5,7 @@
 #include <windows.h>
 #include <shlobj.h>
 
-#include "chrome/browser/tab_contents/web_drop_target.h"
+#include "chrome/browser/tab_contents/web_drop_target_win.h"
 
 #include "app/clipboard/clipboard_util_win.h"
 #include "app/os_exchange_data.h"
diff --git a/chrome/browser/tab_contents/web_drop_target.h b/chrome/browser/tab_contents/web_drop_target_win.h
index 38a3466..fd49033 100644
--- a/chrome/browser/tab_contents/web_drop_target.h
+++ b/chrome/browser/tab_contents/web_drop_target_win.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_TAB_CONTENTS_WEB_DROP_TARGET_H_
-#define CHROME_BROWSER_TAB_CONTENTS_WEB_DROP_TARGET_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_WEB_DROP_TARGET_WIN_H_
+#define CHROME_BROWSER_TAB_CONTENTS_WEB_DROP_TARGET_WIN_H_
 
 #include "base/base_drop_target.h"
 #include "base/scoped_ptr.h"
@@ -70,4 +70,4 @@ class WebDropTarget : public BaseDropTarget {
   DISALLOW_EVIL_CONSTRUCTORS(WebDropTarget);
 };
 
-#endif  // CHROME_BROWSER_TAB_CONTENTS_WEB_DROP_TARGET_H_
+#endif  // CHROME_BROWSER_TAB_CONTENTS_WEB_DROP_TARGET_WIN_H_
diff --git a/chrome/browser/views/tab_contents/tab_contents_view_win.cc b/chrome/browser/views/tab_contents/tab_contents_view_win.cc
index 9c79650..96ae05d 100644
--- a/chrome/browser/views/tab_contents/tab_contents_view_win.cc
+++ b/chrome/browser/views/tab_contents/tab_contents_view_win.cc
@@ -24,8 +24,8 @@
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
-#include "chrome/browser/tab_contents/web_drag_source.h"
-#include "chrome/browser/tab_contents/web_drop_target.h"
+#include "chrome/browser/tab_contents/web_drag_source_win.h"
+#include "chrome/browser/tab_contents/web_drop_target_win.h"
 #include "chrome/browser/views/sad_tab_view.h"
 #include "chrome/browser/views/tab_contents/render_view_context_menu_win.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 78f1a56..f9bebb4 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -2228,12 +2228,12 @@
         'browser/tab_contents/tab_util.h',
         'browser/tab_contents/thumbnail_generator.cc',
         'browser/tab_contents/thumbnail_generator.h',
-        'browser/tab_contents/web_drag_source.cc',
-        'browser/tab_contents/web_drag_source.h',
+        'browser/tab_contents/web_drag_source_win.cc',
+        'browser/tab_contents/web_drag_source_win.h',
         'browser/tab_contents/web_drag_dest_gtk.cc',
         'browser/tab_contents/web_drag_dest_gtk.h',
-        'browser/tab_contents/web_drop_target.cc',
-        'browser/tab_contents/web_drop_target.h',
+        'browser/tab_contents/web_drop_target_win.cc',
+        'browser/tab_contents/web_drop_target_win.h',
         'browser/tabs/tab_strip_model.cc',
         'browser/tabs/tab_strip_model.h',
         'browser/tabs/tab_strip_model_order_controller.cc',
@@ -3107,8 +3107,6 @@
             'browser/importer/ie_importer.cc',
             'browser/jumplist.cc',
             'browser/sandbox_policy.cc',
-            'browser/tab_contents/web_drag_source.cc',
-            'browser/tab_contents/web_drop_target.cc',
           ],
         }],
         # views depends on webkit headers.
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 931a96f..4ff40b7 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -32,11 +32,6 @@ class Message;
 }
 
 //---------------------------------------------------------------------------
-// These stubs are for Browser_main()
-
-void InstallJankometer(const CommandLine&);
-
-//---------------------------------------------------------------------------
 // These stubs are for BrowserProcessImpl
 
 #if !defined(OS_MACOSX)
diff --git a/chrome/renderer/render_process.cc b/chrome/renderer/render_process.cc
index 229187d..ac372ed 100644
--- a/chrome/renderer/render_process.cc
+++ b/chrome/renderer/render_process.cc
@@ -109,8 +109,7 @@ RenderProcess::RenderProcess()
 }
 
 RenderProcess::~RenderProcess() {
-  // TODO(port)
-  // Try and limit what we pull in for our non-Win unit test bundle
+  // TODO(port): Try and limit what we pull in for our non-Win unit test bundle.
 #ifndef NDEBUG
   // log important leaked objects
   webkit_glue::CheckForLeaks();
diff --git a/chrome/renderer/renderer_main_unittest.cc b/chrome/renderer/renderer_main_unittest.cc
index 3553396..a63b0a6 100644
--- a/chrome/renderer/renderer_main_unittest.cc
+++ b/chrome/renderer/renderer_main_unittest.cc
@@ -12,7 +12,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 // TODO(port): Bring up this test this on other platforms.
-#if defined(OS_MACOSX)
+#if defined(OS_POSIX)
 
 using base::ProcessHandle;
 
@@ -59,7 +59,7 @@ ProcessHandle RendererMainTest::SpawnChild(const std::wstring &procname,
     fds_to_map.push_back(std::pair<int,int>(ipcfd, 3));
   }
 
-   return MultiProcessTest::SpawnChild(procname, fds_to_map, false);
+  return MultiProcessTest::SpawnChild(procname, fds_to_map, false);
 }
 
 // Listener class that kills the message loop when it connects.
@@ -101,5 +101,4 @@ TEST_F(RendererMainTest, CreateDestroy) {
 
   EXPECT_TRUE(base::WaitForSingleProcess(renderer_pid, 5000));
 }
-
-#endif  // defined(OS_MACOSX)
+#endif  // defined(OS_POSIX)