Make ExtensionPrefs paths relative, re-enable 2 ExtensionsService unit_tests

chrome/browser/extensions/extension_browsertest.cc

 // 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 "base/ref_counted.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/test_extension_loader.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/browser/views/extensions/extension_shelf.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_error_reporter.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 
 namespace {
 
 // How long to wait for the extension to put up a javascript alert before giving
 // up.
 const int kAlertTimeoutMs = 20000;
 
 // The extensions we're using as our test case.
-const char* kGoodExtension1Id = "00123456789abcdef0123456789abcdef0123456";
-const char* kGoodCrxId        = "00123456789abcdef0123456789abcdef0123456";
+const char* kGoodExtension1Id = "behllobkkfkfnphdnhnkndlbkcpglgmj";
+const char* kGoodCrxId        = "ldnnhddmnhbkjipkidpdiheffobcpfmf";
 
 };  // namespace
 
 // This class starts up an extension process and waits until it tries to put
 // up a javascript alert.
 class MockExtensionHost : public ExtensionHost {
  public:
   MockExtensionHost(Extension* extension, const GURL& url,
                     SiteInstance* instance)
       : ExtensionHost(extension, instance, url, NULL),
@@ skipping 31 matching lines @@
   bool got_message_;
 };
 
 class ExtensionViewTest : public InProcessBrowserTest {
  public:
   virtual void SetUp() {
     // Initialize the error reporter here, otherwise BrowserMain will create it
     // with the wrong MessageLoop.
     ExtensionErrorReporter::Init(false);
 
-    // Use single-process in an attempt to speed it up and make it less flaky.
-    //EnableSingleProcess();
-
     InProcessBrowserTest::SetUp();
   }
   virtual void SetUpCommandLine(CommandLine* command_line) {
     command_line->AppendSwitch(switches::kEnableExtensions);
   }
 };
 
 // Tests that ExtensionView starts an extension process and runs the script
 // contained in the extension's toolstrip.
 // TODO(mpcomplete): http://crbug.com/15081 Disabled because it fails.
 IN_PROC_BROWSER_TEST_F(ExtensionViewTest, DISABLED_Toolstrip) {
   // Get the path to our extension.
   FilePath path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &path));
-  path = path.AppendASCII("extensions").
-      AppendASCII("good").AppendASCII("extension1").AppendASCII("1");
+  path = path.AppendASCII("extensions")
+      .AppendASCII("good")
+      .AppendASCII("Extensions")
+      .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
+      .AppendASCII("1.0.0.0");
   ASSERT_TRUE(file_util::DirectoryExists(path));  // sanity check
 
   // Wait for the extension to load and grab a pointer to it.
   TestExtensionLoader loader(browser()->profile());
   Extension* extension = loader.Load(kGoodExtension1Id, path);
   ASSERT_TRUE(extension);
   GURL url = Extension::GetResourceURL(extension->url(), "toolstrip1.html");
 
   // Start the extension process and wait for it to show a javascript alert.
   MockExtensionHost host(extension, url,
       browser()->profile()->GetExtensionProcessManager()->
           GetSiteInstanceForURL(url));
   EXPECT_TRUE(host.got_message());
 }
 
 // Tests that the ExtensionShelf initializes properly, notices that
 // an extension loaded and has a view available, and then sets that up
 // properly.
 // TODO(mpcomplete): http://crbug.com/15081 Disabled because it fails.
 IN_PROC_BROWSER_TEST_F(ExtensionViewTest, DISABLED_Shelf) {
   // When initialized, there are no extension views and the preferred height
   // should be zero.
   scoped_ptr<ExtensionShelf> shelf(new ExtensionShelf(browser()));
   EXPECT_EQ(shelf->GetChildViewCount(), 0);
   EXPECT_EQ(shelf->GetPreferredSize().height(), 0);
 
   // Get the path to our extension.
   FilePath path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &path));
-  path = path.AppendASCII("extensions").
-      AppendASCII("good").AppendASCII("extension1").AppendASCII("1");
+  path = path.AppendASCII("extensions")
+      .AppendASCII("good")
+      .AppendASCII("Extensions")
+      .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
+      .AppendASCII("1.0.0.0");
   ASSERT_TRUE(file_util::DirectoryExists(path));  // sanity check
 
   // Wait for the extension to load and grab a pointer to it.
   TestExtensionLoader loader(browser()->profile());
   Extension* extension = loader.Load(kGoodExtension1Id, path);
   ASSERT_TRUE(extension);
 
   // There should now be two extension views and preferred height of the view
   // should be non-zero.
   EXPECT_EQ(shelf->GetChildViewCount(), 2);
@@ skipping 18 matching lines @@
 
   // Wait for the extension to load and grab a pointer to it.
   TestExtensionLoader loader(browser()->profile());
   Extension* extension = loader.Install(kGoodCrxId, path);
   ASSERT_TRUE(extension);
 
   // TODO(mpcomplete): wait for uninstall to complete?
   browser()->profile()->GetExtensionsService()->
              UninstallExtension(kGoodCrxId, false);
 }