Part 2 of reapplying r64637.

ceee/ie/plugin/toolband/tool_band.cc

 // 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.
 //
 // IE toolband implementation.
 #include "ceee/ie/plugin/toolband/tool_band.h"
 
 #include <atlsafe.h>
 #include <atlstr.h>
 #include <shlguid.h>
 
 #include "base/debug/trace_event.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "ceee/common/com_utils.h"
 #include "ceee/common/window_utils.h"
 #include "ceee/common/windows_constants.h"
 #include "ceee/ie/common/extension_manifest.h"
 #include "ceee/ie/common/ceee_module_util.h"
 #include "ceee/ie/plugin/bho/tool_band_visibility.h"
+#include "chrome/common/automation_constants.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/test/automation/automation_constants.h"
 #include "chrome_frame/com_message_event.h"
 
 _ATL_FUNC_INFO ToolBand::handler_type_idispatch_ =
     { CC_STDCALL, VT_EMPTY, 1, { VT_DISPATCH } };
 _ATL_FUNC_INFO ToolBand::handler_type_long_ =
     { CC_STDCALL, VT_EMPTY, 1, { VT_I4 } };
 _ATL_FUNC_INFO ToolBand::handler_type_idispatch_bstr_ =
     { CC_STDCALL, VT_EMPTY, 2, { VT_DISPATCH, VT_BSTR } };
 _ATL_FUNC_INFO ToolBand::handler_type_bstr_i4_=
     { CC_STDCALL, VT_EMPTY, 2, { VT_BSTR, VT_I4 } };
@@ skipping 591 matching lines @@
   return own_line_flag_;
 }
 
 void ToolBand::ClearForceOwnLineFlag() {
   if (own_line_flag_ || !already_checked_own_line_flag_) {
     own_line_flag_ = false;
     already_checked_own_line_flag_ = true;
     ceee_module_util::SetOptionToolbandForceReposition(false);
   }
 }