Part 2 of reapplying r64637.

chrome/browser/extensions/extension_uitest.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.
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/automation/extension_automation_constants.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
+#include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/test/automation/automation_messages.h"
 #include "chrome/test/automation/automation_proxy_uitest.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING
 #include "testing/gmock_mutant.h"
 
 namespace {
@@ skipping 456 matching lines @@
   ASSERT_EQ(arraysize(events_), event_count_.size());
   for (std::map<std::string, int>::iterator i = event_count_.begin();
       i != event_count_.end(); ++i) {
     const std::pair<std::string, int>& value = *i;
     EXPECT_EQ(1, value.second);
   }
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace