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

2 files changed, 0 insertions, 43 deletions

diff --git a/chrome/test/automation/extension_automation_constants.cc b/chrome/test/automation/extension_automation_constants.cc
deleted file mode 100644
index 99ecadb..0000000
--- a/chrome/test/automation/extension_automation_constants.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2009 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 "chrome/test/automation/extension_automation_constants.h"
-
-namespace extension_automation_constants {
-
-const wchar_t kAutomationRequestIdKey[] = L"rqid";
-const wchar_t kAutomationHasCallbackKey[] = L"hascb";
-const wchar_t kAutomationErrorKey[] = L"err";
-const wchar_t kAutomationNameKey[] = L"name";
-const wchar_t kAutomationArgsKey[] = L"args";
-const wchar_t kAutomationResponseKey[] = L"res";
-const char kAutomationOrigin[] = "__priv_xtapi";
-const char kAutomationRequestTarget[] = "__priv_xtreq";
-const char kAutomationResponseTarget[] = "__priv_xtres";
-
-}  // namespace extension_automation_constants
diff --git a/chrome/test/automation/extension_automation_constants.h b/chrome/test/automation/extension_automation_constants.h
deleted file mode 100644
index 715c379..0000000
--- a/chrome/test/automation/extension_automation_constants.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2009 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.
-
-// Constants used to encode requests and responses for automation.
-
-#ifndef CHROME_TEST_AUTOMATION_EXTENSION_AUTOMATION_CONSTANTS_H_
-#define CHROME_TEST_AUTOMATION_EXTENSION_AUTOMATION_CONSTANTS_H_
-
-namespace extension_automation_constants {
-
-extern const wchar_t kAutomationRequestIdKey[];
-extern const wchar_t kAutomationHasCallbackKey[];
-extern const wchar_t kAutomationErrorKey[];  // not present implies success
-extern const wchar_t kAutomationNameKey[];
-extern const wchar_t kAutomationArgsKey[];
-extern const wchar_t kAutomationResponseKey[];
-extern const char kAutomationOrigin[];
-extern const char kAutomationRequestTarget[];
-extern const char kAutomationResponseTarget[];
-
-};  // namespace automation_extension_constants
-
-#endif  // CHROME_TEST_AUTOMATION_EXTENSION_AUTOMATION_CONSTANTS_H_