distiller: Retires support of CreateNewContext.

components/dom_distiller/core/distiller_page.cc

 // Copyright 2013 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 "components/dom_distiller/core/distiller_page.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "grit/components_resources.h"
 #include "third_party/dom_distiller_js/dom_distiller.pb.h"
 #include "third_party/dom_distiller_js/dom_distiller_json_converter.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "url/gurl.h"
 
 namespace dom_distiller {
 
 namespace {
 
 const char* kOptionsPlaceholder = "$$OPTIONS";
 const char* kStringifyPlaceholder = "$$STRINGIFY";
-const char* kNewContextPlaceholder = "$$NEW_CONTEXT";
 
 std::string GetDistillerScriptWithOptions(
     const dom_distiller::proto::DomDistillerOptions& options,
-    bool stringify_output,
-    bool create_new_context) {
+    bool stringify_output) {
   std::string script = ResourceBundle::GetSharedInstance()
                            .GetRawDataResource(IDR_DISTILLER_JS)
                            .as_string();
   if (script.empty()) {
     return "";
   }
 
   scoped_ptr<base::Value> options_value(
       dom_distiller::proto::json::DomDistillerOptions::WriteToValue(options));
   std::string options_json;
   if (!base::JSONWriter::Write(*options_value, &options_json)) {
     NOTREACHED();
   }
   size_t options_offset = script.find(kOptionsPlaceholder);
   DCHECK_NE(std::string::npos, options_offset);
   DCHECK_EQ(std::string::npos,
             script.find(kOptionsPlaceholder, options_offset + 1));
   script =
       script.replace(options_offset, strlen(kOptionsPlaceholder), options_json);
 
   std::string stringify = stringify_output ? "true" : "false";
   size_t stringify_offset = script.find(kStringifyPlaceholder);
   DCHECK_NE(std::string::npos, stringify_offset);
   DCHECK_EQ(std::string::npos,
             script.find(kStringifyPlaceholder, stringify_offset + 1));
   script = script.replace(stringify_offset,
                           strlen(kStringifyPlaceholder),
                           stringify);
 
-  std::string new_context = create_new_context ? "true" : "false";
-  size_t new_context_offset = script.find(kNewContextPlaceholder);
-  DCHECK_NE(std::string::npos, new_context_offset);
-  DCHECK_EQ(std::string::npos,
-            script.find(kNewContextPlaceholder, new_context_offset + 1));
-  script = script.replace(new_context_offset,
-                          strlen(kNewContextPlaceholder),
-                          new_context);
-
   return script;
 }
 
 }
 
 DistillerPageFactory::~DistillerPageFactory() {}
 
 DistillerPage::DistillerPage() : ready_(true) {}
 
 DistillerPage::~DistillerPage() {}
 
 void DistillerPage::DistillPage(
     const GURL& gurl,
     const dom_distiller::proto::DomDistillerOptions options,
     const DistillerPageCallback& callback) {
   DCHECK(ready_);
   // It is only possible to distill one page at a time. |ready_| is reset when
   // the callback to OnDistillationDone happens.
   ready_ = false;
   distiller_page_callback_ = callback;
   distillation_start_ = base::TimeTicks::Now();
   DistillPageImpl(gurl, GetDistillerScriptWithOptions(options,
-                                                      StringifyOutput(),
-                                                      CreateNewContext()));
+                                                      StringifyOutput()));
 }
 
 void DistillerPage::OnDistillationDone(const GURL& page_url,
                                        const base::Value* value) {
   DCHECK(!ready_);
   ready_ = true;
 
   scoped_ptr<dom_distiller::proto::DomDistillerResult> distiller_result(
       new dom_distiller::proto::DomDistillerResult());
   bool found_content;
@@ skipping 56 matching lines @@
       }
     }
   }
 
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(distiller_page_callback_,
                             base::Passed(&distiller_result), found_content));
 }
 
 }  // namespace dom_distiller