diff options
| author | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 19:15:08 +0000 |
|---|---|---|
| committer | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 19:15:08 +0000 |
| commit | 4a8d3279cc9f2149c90d36550a55d01a264ba0a3 (patch) | |
| tree | 10686a040d5bbb5af5dc4686564ceec0189fee22 /chrome/browser/extensions/extension_view_unittest.cc | |
| parent | a724b6ad91affee34adc5c3ab25b05536bb51f6d (diff) | |
| download | chromium_src-4a8d3279cc9f2149c90d36550a55d01a264ba0a3.zip chromium_src-4a8d3279cc9f2149c90d36550a55d01a264ba0a3.tar.gz chromium_src-4a8d3279cc9f2149c90d36550a55d01a264ba0a3.tar.bz2 | |
Unrevert 11294.
- include stub fix so that linux/mac still build.
- fix DCHECK in views code.
- fix unit test.
Review URL: http://codereview.chromium.org/41020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_view_unittest.cc')
| -rwxr-xr-x | chrome/browser/extensions/extension_view_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_view_unittest.cc b/chrome/browser/extensions/extension_view_unittest.cc index 70ebd90..102b9bb 100755 --- a/chrome/browser/extensions/extension_view_unittest.cc +++ b/chrome/browser/extensions/extension_view_unittest.cc @@ -130,7 +130,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionViewTest, Index) { // Now wait for it to load, and grab a pointer to it. Extension* extension = observer.WaitForExtension(); ASSERT_TRUE(extension); - GURL url = Extension::GetResourceURL(extension->url(), "index.html"); + GURL url = Extension::GetResourceURL(extension->url(), "toolstrip.html"); // Start the extension process and wait for it to show a javascript alert. MockExtensionView view(url, profile); |