Generate IDs for --load-extension by hashing the path instead

of incrementing a static counter.

BUG=21281
TEST=Load an unpacked extension from chrome://extensions/ that
does not have an ID in its manifest. The resulting ID should
be random-looking, not something like "aaaaaa".

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

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

1 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc
index bdda3dd..bab50d1 100644
--- a/chrome/browser/extensions/extension_browsertests_misc.cc
+++ b/chrome/browser/extensions/extension_browsertests_misc.cc
@@ -27,9 +27,6 @@
 #include "chrome/test/ui_test_utils.h"
 #include "net/base/net_util.h"
 
-// ID assigned to the first unpacked extension loaded by LoadExtension().
-#define kDefaultExtensionID "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-
 const std::wstring kSubscribePage =
     L"files/extensions/samples/subscribe_page_action/subscribe.html";
 const std::wstring kValidFeed0 = L"files/feeds/feed_script.xml";
@@ -250,7 +247,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, UnloadPageAction) {
   ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(feed));
   ASSERT_TRUE(WaitForPageActionCountChangeTo(1));
 
-  UnloadExtension(kDefaultExtensionID);
+  UnloadExtension(last_loaded_extension_id_);
 
   // Make sure the page action goes away when it's unloaded.
   ASSERT_TRUE(WaitForPageActionCountChangeTo(0));
@@ -622,7 +619,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenExtension) {
 
   TabContents* newtab = WindowOpenHelper(
       browser(),
-      GURL("chrome-extension://" kDefaultExtensionID "/test.html"),
+      GURL(std::string("chrome-extension://") + last_loaded_extension_id_ +
+           "/test.html"),
       "newtab.html");
 
   bool result = false;
@@ -639,7 +637,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenInvalidExtension) {
 
   WindowOpenHelper(
       browser(),
-      GURL("chrome-extension://" kDefaultExtensionID "/test.html"),
+      GURL(std::string("chrome-extension://") + last_loaded_extension_id_ +
+           "/test.html"),
       "chrome-extension://thisissurelynotavalidextensionid/newtab.html");
 
   // If we got to this point, we didn't crash, so we're good.
@@ -655,7 +654,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenNoPrivileges) {
   TabContents* newtab = WindowOpenHelper(
       browser(),
       GURL("about:blank"),
-      "chrome-extension://" kDefaultExtensionID "/newtab.html");
+      std::string("chrome-extension://") + last_loaded_extension_id_ +
+          "/newtab.html");
 
   // Extension API should fail.
   bool result = false;