diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-23 03:55:54 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-23 03:55:54 +0000 |
| commit | 7c4ddc45fc07c653733e260f9814f25d85594717 (patch) | |
| tree | a4c715a1c9e65c7c353d57ccd2aabbe06fab2977 /chrome/browser/extensions/extension_uitest.cc | |
| parent | fa8a2b1b050009d67e03cf03a26d7d558afe0ecb (diff) | |
| download | chromium_src-7c4ddc45fc07c653733e260f9814f25d85594717.zip chromium_src-7c4ddc45fc07c653733e260f9814f25d85594717.tar.gz chromium_src-7c4ddc45fc07c653733e260f9814f25d85594717.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/extensions/extension_uitest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_uitest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_uitest.cc b/chrome/browser/extensions/extension_uitest.cc index da075ca..867a13a 100644 --- a/chrome/browser/extensions/extension_uitest.cc +++ b/chrome/browser/extensions/extension_uitest.cc @@ -7,9 +7,9 @@ #include "base/json_reader.h" #include "base/json_writer.h" #include "base/values.h" +#include "chrome/browser/automation/extension_automation_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/automation/automation_proxy_uitest.h" -#include "chrome/test/automation/extension_automation_constants.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/ui/ui_test.h" #include "googleurl/src/gurl.h" |