Remove unused ATL headers.

BUG=5027
TEST=none
Review URL: http://codereview.chromium.org/194051

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

chrome/browser/first_run_win.cc

@@ -4,8 +4,6 @@
 
 #include "chrome/browser/first_run.h"
 
-#include <atlbase.h>
-#include <atlcom.h>
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>

chrome/browser/tab_contents/web_drag_source.cc

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#if defined(OS_WIN)
-#include <atlbase.h>
-#include <atlapp.h>
-#include <atlmisc.h>
-#endif
-
 #include "chrome/browser/tab_contents/web_drag_source.h"
 
 #include "chrome/browser/renderer_host/render_view_host.h"

chrome/renderer/webplugin_delegate_proxy.cc

@@ -4,15 +4,12 @@
 
 #include "chrome/renderer/webplugin_delegate_proxy.h"
 
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include <atlbase.h>
-#endif
+#include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/ref_counted.h"
@@ -117,7 +114,7 @@ class ResourceClientProxy : public webkit_glue::WebPluginResourceClient {
 
   void DidReceiveData(const char* buffer, int length, int data_offset) {
     DCHECK(channel_ != NULL);
-    DCHECK(length > 0);
+    DCHECK_GT(length, 0);
     std::vector<char> data;
     data.resize(static_cast<size_t>(length));
     memcpy(&data.front(), buffer, length);
@@ -216,10 +213,10 @@ void WebPluginDelegateProxy::PluginDestroyed() {
 }
 
 bool WebPluginDelegateProxy::Initialize(const GURL& url,
-                                        const std::vector<std::string>& arg_names,
-                                        const std::vector<std::string>& arg_values,
-                                        webkit_glue::WebPlugin* plugin,
-                                        bool load_manually) {
+    const std::vector<std::string>& arg_names,
+    const std::vector<std::string>& arg_values,
+    webkit_glue::WebPlugin* plugin,
+    bool load_manually) {
   IPC::ChannelHandle channel_handle;
   WebPluginInfo info;
   if (!RenderThread::current()->Send(new ViewHostMsg_OpenChannelToPlugin(
@@ -323,7 +320,7 @@ void WebPluginDelegateProxy::DidReceiveManualResponse(
 
 void WebPluginDelegateProxy::DidReceiveManualData(const char* buffer,
                                                   int length) {
-  DCHECK(length > 0);
+  DCHECK_GT(length, 0);
   std::vector<char> data;
   data.resize(static_cast<size_t>(length));
   memcpy(&data.front(), buffer, length);
@@ -436,7 +433,7 @@ void WebPluginDelegateProxy::UpdateGeometry(const gfx::Rect& window_rect,
     }
   }
 
- IPC::Message* msg;
+  IPC::Message* msg;
 #if defined (OS_WIN)
   std::wstring filename = StringToLowerASCII(info_.path.BaseName().value());
   if (info_.name.find(L"Windows Media Player") != std::wstring::npos) {

chrome/test/plugin/plugin_test.cpp

@@ -40,13 +40,14 @@
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
-#include <atlbase.h>
 #include <comutil.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <memory.h>
 
+#include <string>
+
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/registry.h"

chrome/test/ui/npapi_uitest.cc

@@ -6,7 +6,6 @@
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
-#include <atlbase.h>
 #include <comutil.h>
 
 // runtime headers
@@ -207,7 +206,7 @@ TEST_F(NPAPIVisiblePluginTester, AlertInWindowMessage) {
   ASSERT_TRUE(automation()->GetShowingAppModalDialog(&modal_dialog_showing,
       &available_buttons));
   ASSERT_TRUE(modal_dialog_showing);
-  ASSERT_TRUE((MessageBoxFlags::DIALOGBUTTON_OK & available_buttons) != 0);
+  ASSERT_NE((MessageBoxFlags::DIALOGBUTTON_OK & available_buttons), 0);
   ASSERT_TRUE(automation()->ClickAppModalDialogButton(
       MessageBoxFlags::DIALOGBUTTON_OK));
 
@@ -216,7 +215,7 @@ TEST_F(NPAPIVisiblePluginTester, AlertInWindowMessage) {
   ASSERT_TRUE(automation()->GetShowingAppModalDialog(&modal_dialog_showing,
       &available_buttons));
   ASSERT_TRUE(modal_dialog_showing);
-  ASSERT_TRUE((MessageBoxFlags::DIALOGBUTTON_OK & available_buttons) != 0);
+  ASSERT_NE((MessageBoxFlags::DIALOGBUTTON_OK & available_buttons), 0);
   ASSERT_TRUE(automation()->ClickAppModalDialogButton(
       MessageBoxFlags::DIALOGBUTTON_OK));
 }
@@ -244,14 +243,14 @@ TEST_F(NPAPIVisiblePluginTester, NewFails) {
 }
 
 TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInNPNEvaluate) {
- if (!UITest::in_process_renderer()) {
+  if (!UITest::in_process_renderer()) {
     GURL url = GetTestUrl(L"npapi",
                           L"execute_script_delete_in_npn_evaluate.html");
     NavigateToURL(url);
     WaitForFinish("npobject_delete_plugin_in_evaluate", "1", url,
                   kTestCompleteCookie, kTestCompleteSuccess,
                   kShortWaitTimeout);
- }
+  }
 }
 
 // Flaky. See http://crbug.com/17645