Part 2 of reapplying r64637.

ceee/ie/plugin/bho/browser_helper_object.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 browser helper object implementation.
 #include "ceee/ie/plugin/bho/browser_helper_object.h"
 
 #include <atlsafe.h>
 #include <shlguid.h>
 
@@ skipping 10 matching lines @@
 #include "ceee/common/windows_constants.h"
 #include "ceee/ie/broker/tab_api_module.h"
 #include "ceee/ie/common/extension_manifest.h"
 #include "ceee/ie/common/ie_util.h"
 #include "ceee/ie/common/ceee_module_util.h"
 #include "ceee/ie/plugin/bho/cookie_accountant.h"
 #include "ceee/ie/plugin/bho/http_negotiate.h"
 #include "ceee/ie/plugin/scripting/script_host.h"
 #include "chrome/browser/automation/extension_automation_constants.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
+#include "chrome/common/automation_constants.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/test/automation/automation_constants.h"
 #include "googleurl/src/gurl.h"
 
 #include "broker_lib.h"  // NOLINT
 
 namespace keys = extension_tabs_module_constants;
 namespace ext = extension_automation_constants;
 
 
 _ATL_FUNC_INFO
     BrowserHelperObject::handler_type_idispatch_5variantptr_boolptr_ = {
@@ skipping 1318 matching lines @@
   DCHECK(thread_id_ == ::GetCurrentThreadId());
 
   if (sink == NULL)
     return;
 
   std::vector<Sink*>::iterator iter = std::find(sinks_.begin(), sinks_.end(),
                                                 sink);
   if (iter != sinks_.end())
     sinks_.erase(iter);
 }