DevTools: migrate sanity tests to javascript.

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

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

7 files changed, 21 insertions, 68 deletions

diff --git a/chrome/browser/debugger/devtools_manager.cc b/chrome/browser/debugger/devtools_manager.cc
index b58319e..16962bc 100644
--- a/chrome/browser/debugger/devtools_manager.cc
+++ b/chrome/browser/debugger/devtools_manager.cc
@@ -90,7 +90,6 @@ void DevToolsManager::ForwardToDevToolsClient(RenderViewHost* inspected_rvh,
 }
 
 void DevToolsManager::OpenDevToolsWindow(RenderViewHost* inspected_rvh) {
-  EnableDevToolsInPrefs(inspected_rvh);
   DevToolsClientHost* host = GetDevToolsClientHostFor(inspected_rvh);
   if (!host) {
     host = new DevToolsWindow(
@@ -196,16 +195,6 @@ void DevToolsManager::SendDetachToAgent(RenderViewHost* inspected_rvh) {
   }
 }
 
-void DevToolsManager::EnableDevToolsInPrefs(RenderViewHost* inspected_rvh) {
-  Profile* profile = inspected_rvh->site_instance()->browsing_instance()->
-      profile();
-  if (!profile->GetPrefs()->GetBoolean(prefs::kWebKitDeveloperExtrasEnabled)) {
-    //TODO(pfeldman): Show message box with warning to the user.
-    profile->GetPrefs()->SetBoolean(prefs::kWebKitDeveloperExtrasEnabled,
-        true);
-  }
-}
-
 void DevToolsManager::ForceReopenWindow() {
   if (inspected_rvh_for_reopen_) {
     OpenDevToolsWindow(inspected_rvh_for_reopen_);
diff --git a/chrome/browser/debugger/devtools_manager.h b/chrome/browser/debugger/devtools_manager.h
index 7da2ec5..d911250 100644
--- a/chrome/browser/debugger/devtools_manager.h
+++ b/chrome/browser/debugger/devtools_manager.h
@@ -69,8 +69,6 @@ private:
   void SendAttachToAgent(RenderViewHost* inspected_rvh);
   void SendDetachToAgent(RenderViewHost* inspected_rvh);
 
-  void EnableDevToolsInPrefs(RenderViewHost* inspected_rvh);
-
   void ForceReopenWindow();
 
   // These two maps are for tracking dependencies between inspected tabs and
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index fd78e3f..09b3cca 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -51,6 +51,20 @@ class DevToolsSanityTest : public InProcessBrowserTest {
     EnableDOMAutomation();
   }
 
+ protected:
+  void RunTest(const std::string& test_name) {
+    OpenDevToolsWindow();
+    std::string result;
+    ASSERT_TRUE(
+        ui_test_utils::ExecuteJavaScriptAndExtractString(
+            client_contents_,
+            L"",
+            UTF8ToWide(StringPrintf("uiTests.runTest('%s')", test_name.c_str())),
+            &result));
+    EXPECT_EQ("[OK]", result);
+    CloseDevToolsWindow();
+  }
+
   void OpenDevToolsWindow() {
     HTTPTestServer* server = StartHTTPServer();
     GURL url = server->TestServerPageW(kSimplePage);
@@ -75,65 +89,24 @@ class DevToolsSanityTest : public InProcessBrowserTest {
     BrowserClosedObserver close_observer(window_->browser());
   }
 
-  void AssertTrue(const std::string& expr) {
-    AssertEquals("true", expr);
-  }
-
-  void AssertEquals(const std::string& expected, const std::string& expr) {
-    std::string call = StringPrintf(
-        "try {"
-        "  var domAgent = devtools.tools.getDomAgent();"
-        "  var doc = domAgent.getDocument();"
-        "  window.domAutomationController.send((%s) + '');"
-        "} catch(e) {"
-        "  window.domAutomationController.send(e.toString());"
-        "}", expr.c_str());
-    std::string result;
-    ASSERT_TRUE(
-        ui_test_utils::ExecuteJavaScriptAndExtractString(
-            client_contents_,
-            L"",
-            UTF8ToWide(call),
-            &result));
-    ASSERT_EQ(expected, result);
-  }
-
- protected:
   TabContents* client_contents_;
   DevToolsWindow* window_;
   RenderViewHost* inspected_rvh_;
 };
 
 // WebInspector opens.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, OpenWebInspector) {
-  OpenDevToolsWindow();
-  AssertTrue("typeof DevToolsHost == 'object' && !DevToolsHost.isStub");
-  AssertTrue("!!doc.documentElement");
-  CloseDevToolsWindow();
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestHostIsPresent) {
+  RunTest("testHostIsPresent");
 }
 
 // Tests elements panel basics.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, ElementsPanel) {
-  OpenDevToolsWindow();
-  AssertEquals("HTML", "doc.documentElement.nodeName");
-  AssertTrue("doc.documentElement.hasChildNodes()");
-  CloseDevToolsWindow();
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestElementsTreeRoot) {
+  RunTest("testElementsTreeRoot");
 }
 
 // Tests resources panel basics.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_ResourcesPanel) {
-  OpenDevToolsWindow();
-  std::string func =
-      "function() {"
-      "  var tokens = [];"
-      "  var resources = WebInspector.resources;"
-      "  for (var id in resources) {"
-      "    tokens.push(resources[id]);"
-      "  }"
-      "  return tokens.join(',');"
-      "}()";
-  AssertEquals("simple_page.html", func);
-  CloseDevToolsWindow();
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestMainResource) {
+  RunTest("testMainResource");
 }
 
 }  // namespace
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index f0608bc..f8d20a3 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -148,8 +148,7 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
   {  // Command line switches are used for preferences with no user interface.
     const CommandLine& command_line = *CommandLine::ForCurrentProcess();
     web_prefs.developer_extras_enabled =
-        !command_line.HasSwitch(switches::kDisableDevTools) &&
-        prefs->GetBoolean(prefs::kWebKitDeveloperExtrasEnabled);
+        !command_line.HasSwitch(switches::kDisableDevTools);
     web_prefs.javascript_enabled =
         !command_line.HasSwitch(switches::kDisableJavaScript) &&
         prefs->GetBoolean(prefs::kWebKitJavascriptEnabled);
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 47b3eb2..4d200c2 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -132,7 +132,6 @@ const wchar_t* kPrefsToObserve[] = {
   prefs::kWebKitLoadsImagesAutomatically,
   prefs::kWebKitPluginsEnabled,
   prefs::kWebKitUsesUniversalDetector,
-  prefs::kWebKitDeveloperExtrasEnabled,
   prefs::kWebKitSerifFontFamily,
   prefs::kWebKitSansSerifFontFamily,
   prefs::kWebKitFixedFontFamily,
@@ -363,8 +362,6 @@ void TabContents::RegisterUserPrefs(PrefService* prefs) {
                              pref_defaults.dom_paste_enabled);
   prefs->RegisterBooleanPref(prefs::kWebKitShrinksStandaloneImagesToFit,
                              pref_defaults.shrinks_standalone_images_to_fit);
-  prefs->RegisterBooleanPref(prefs::kWebKitDeveloperExtrasEnabled,
-                             pref_defaults.developer_extras_enabled);
   prefs->RegisterStringPref(prefs::kWebKitInspectorSettings,
                             pref_defaults.inspector_settings);
   prefs->RegisterBooleanPref(prefs::kWebKitTextAreasAreResizable,
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index e6f06d1..d600973 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -115,8 +115,6 @@ const wchar_t kWebKitPluginsEnabled[] = L"webkit.webprefs.plugins_enabled";
 const wchar_t kWebKitDomPasteEnabled[] = L"webkit.webprefs.dom_paste_enabled";
 const wchar_t kWebKitShrinksStandaloneImagesToFit[] =
     L"webkit.webprefs.shrinks_standalone_images_to_fit";
-const wchar_t kWebKitDeveloperExtrasEnabled[] =
-    L"webkit.webprefs.developer_extras_enabled";
 const wchar_t kWebKitInspectorSettings[] =
     L"webkit.webprefs.inspector_settings";
 const wchar_t kWebKitUsesUniversalDetector[] =
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index ffd1c06..3cb4325 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -43,7 +43,6 @@ extern const wchar_t kWebKitLoadsImagesAutomatically[];
 extern const wchar_t kWebKitPluginsEnabled[];
 extern const wchar_t kWebKitDomPasteEnabled[];
 extern const wchar_t kWebKitShrinksStandaloneImagesToFit[];
-extern const wchar_t kWebKitDeveloperExtrasEnabled[];
 extern const wchar_t kWebKitInspectorSettings[];
 extern const wchar_t kWebKitUsesUniversalDetector[];
 extern const wchar_t kWebKitTextAreasAreResizable[];