Revert of Expose distiller functions to JavaScript

chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc

 // Copyright 2014 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 <string.h>
 
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/common/chrome_isolated_world_ids.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
 #include "components/dom_distiller/content/browser/dom_distiller_viewer_source.h"
 #include "components/dom_distiller/core/article_entry.h"
 #include "components/dom_distiller/core/distilled_page_prefs.h"
 #include "components/dom_distiller/core/distiller.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "components/dom_distiller/core/dom_distiller_store.h"
 #include "components/dom_distiller/core/dom_distiller_switches.h"
@@ skipping 35 matching lines @@
 const char kGetContent[] =
     "window.domAutomationController.send("
         "document.getElementById('content').innerHTML)";
 
 const char kGetBodyClass[] =
     "window.domAutomationController.send("
         "document.body.className)";
 
 const unsigned kDarkToolbarThemeColor = 0xFF1A1A1A;
 
-const char kTestDistillerObject[] =
-    "window.domAutomationController.send("
-    "typeof distiller == 'object')";
-
 void AddEntry(const ArticleEntry& e, FakeDB<ArticleEntry>::EntryMap* map) {
   (*map)[e.entry_id()] = e;
 }
 
 ArticleEntry CreateEntry(std::string entry_id, std::string page_url) {
   ArticleEntry entry;
   entry.set_entry_id(entry_id);
   if (!page_url.empty()) {
     ArticleEntryPage* page = entry.add_pages();
     page->set_url(page_url);
@@ skipping 233 matching lines @@
   distiller->RunDistillerUpdateCallback(update);
 
   content::WaitForLoadStop(contents);
 
   EXPECT_TRUE(content::ExecuteScriptAndExtractString(
       contents, kGetContent , &result));
   EXPECT_THAT(result, HasSubstr("content"));
 }
 
 IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
-                       DistillerJavaScriptExposed) {
-  // Navigate to a distiller URL.
-  GURL url(std::string(kDomDistillerScheme) + "://url");
-  chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_TYPED);
-  chrome::Navigate(&params);
-
-  content::WebContents* contents =
-      browser()->tab_strip_model()->GetActiveWebContents();
-
-  // Wait for the page load to complete (this will be a distiller error page).
-  content::WaitForLoadStop(contents);
-
-  bool result;
-  // Execute in isolated world; where all distiller scripts are run.
-  EXPECT_TRUE(content::ExecuteScriptInIsolatedWorldAndExtractBool(
-      contents, chrome::ISOLATED_WORLD_ID_CHROME_INTERNAL, kTestDistillerObject,
-      &result));
-  EXPECT_TRUE(result);
-}
-
-IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
-                       DistillerJavaScriptNotInMainWorld) {
-  // Navigate to a distiller URL.
-  GURL url(std::string(kDomDistillerScheme) + "://url");
-  chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_TYPED);
-  chrome::Navigate(&params);
-
-  content::WebContents* contents =
-      browser()->tab_strip_model()->GetActiveWebContents();
-
-  // Wait for the page load to complete (this will be a distiller error page).
-  content::WaitForLoadStop(contents);
-
-  bool result;
-  // Execute in main world, the distiller object should not be here.
-  EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
-      contents, kTestDistillerObject, &result));
-  EXPECT_FALSE(result);
-}
-
-IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
-                       DistillerJavaScriptNotExposed) {
-  // Navigate to a non-distiller URL.
-  GURL url("http://url");
-  chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_TYPED);
-  chrome::Navigate(&params);
-
-  content::WebContents* contents =
-      browser()->tab_strip_model()->GetActiveWebContents();
-
-  // Wait for the page load to complete.
-  content::WaitForLoadStop(contents);
-
-  bool result;
-  EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
-      contents, kTestDistillerObject, &result));
-  EXPECT_FALSE(result);
-}
-
-IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest, MultiPageArticle) {
+                       MultiPageArticle) {
   expect_distillation_ = false;
   expect_distiller_page_ = true;
   dom_distiller::DomDistillerServiceFactory::GetInstance()
       ->SetTestingFactoryAndUse(browser()->profile(), &Build);
 
   scoped_refptr<content::MessageLoopRunner> distillation_done_runner =
       new content::MessageLoopRunner;
 
   FakeDistiller* distiller = new FakeDistiller(
       false,
@@ skipping 111 matching lines @@
   EXPECT_EQ(kDarkToolbarThemeColor, contents->GetThemeColor());
 
   distilled_page_prefs->SetFontFamily(DistilledPagePrefs::SERIF);
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(
       content::ExecuteScriptAndExtractString(contents, kGetBodyClass, &result));
   EXPECT_EQ("dark serif", result);
 }
 
 }  // namespace dom_distiller