Committing issue 113734 for Joi.

Description:

Make sure extension_uitest.cc is actually built (my bad - got confused
about the whole .gyp vs. .sln thing).

Also, to get things building now that extension_uitest.cc is built,
shuffle the extension automation constants around so they end up in
the browser library (I didn't realize the UI tests are already linking
with that, and the linker was bringing in the
automation_extension_function.obj file ended up causing lots of
unresolved linker problems).  Note that this did build the other day
when I submitted the file originally, but it must have been
essentially a fluke that the linker chose the other .obj file to get
the constants.

BUG=none
TEST=none

Original issue: http://codereview.chromium.org/113734

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

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

1 files changed, 1 insertions, 8 deletions

diff --git a/chrome/browser/automation/automation_extension_function.cc b/chrome/browser/automation/automation_extension_function.cc
index 314718a..776866e 100644
--- a/chrome/browser/automation/automation_extension_function.cc
+++ b/chrome/browser/automation/automation_extension_function.cc
@@ -8,16 +8,9 @@
 
 #include "base/json_reader.h"
 #include "base/json_writer.h"
+#include "chrome/browser/automation/extension_automation_constants.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/test/automation/extension_automation_constants.h"
-
-// We are the only compilation unit outside of test code that needs the
-// definition of these constants.  Including the .cc file here instead of
-// putting it into chrome.gyp (SCons builds on Linux don't like it when you
-// have the same file in two different projects) or linking to the test support
-// lib.
-#include "chrome/test/automation/extension_automation_constants.cc"
 
 bool AutomationExtensionFunction::enabled_ = false;