Moving the MHTML API out of experimental and renaming it.

chrome/browser/extensions/extension_page_capture_apitest.cc

Index: chrome/browser/extensions/extension_page_capture_apitest.cc
diff --git a/chrome/browser/extensions/extension_save_page_apitest.cc b/chrome/browser/extensions/extension_page_capture_apitest.cc
similarity index 62%
rename from chrome/browser/extensions/extension_save_page_apitest.cc
rename to chrome/browser/extensions/extension_page_capture_apitest.cc
index b01b9422e6236263ef8e412631a454f71cbe01c9..c05dd8d4a5ed50d7600a8e876a3122d631bfa444 100644
--- a/chrome/browser/extensions/extension_save_page_apitest.cc
+++ b/chrome/browser/extensions/extension_page_capture_apitest.cc
@@ -5,17 +5,15 @@
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/extensions/extension_save_page_api.h"
+#include "chrome/browser/extensions/extension_page_capture_api.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "net/base/mock_host_resolver.h"
 
-class ExtensionSavePageApiTest : public ExtensionApiTest {
+class ExtensionPageCaptureApiTest : public ExtensionApiTest {
  public:
-  // TODO(jcivelli): remove this once save-page APIs are no longer experimental.
   virtual void SetUpCommandLine(CommandLine* command_line) {
     ExtensionApiTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
     command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose-gc");
   }
 
@@ -30,19 +28,20 @@ class ExtensionSavePageApiTest : public ExtensionApiTest {
 
 // Disabled on Linux http://crbug.com/98194
 #if defined(OS_LINUX)
-#define MAYBE_SavePageAsMHTML DISABLED_SavePageAsMHTML
+#define MAYBE_SaveAsMHTML DISABLED_SaveAsMHTML
 #else
-#define MAYBE_SavePageAsMHTML SavePageAsMHTML
+#define MAYBE_SaveAsMHTML SaveAsMHTML
 #endif  // defined(OS_LINUX)
 
-class SavePageAsMHTMLDelegate : public SavePageAsMHTMLFunction::TestDelegate {
+class PageCaptureSaveAsMHTMLDelegate
+    : public PageCaptureSaveAsMHTMLFunction::TestDelegate {
  public:
-  SavePageAsMHTMLDelegate() {
-    SavePageAsMHTMLFunction::SetTestDelegate(this);
+  PageCaptureSaveAsMHTMLDelegate() {
+    PageCaptureSaveAsMHTMLFunction::SetTestDelegate(this);
   }
 
-  virtual ~SavePageAsMHTMLDelegate() {
-    SavePageAsMHTMLFunction::SetTestDelegate(NULL);
+  virtual ~PageCaptureSaveAsMHTMLDelegate() {
+    PageCaptureSaveAsMHTMLFunction::SetTestDelegate(NULL);
   }
 
   virtual void OnTemporaryFileCreated(const FilePath& temp_file) OVERRIDE {
@@ -52,12 +51,11 @@ class SavePageAsMHTMLDelegate : public SavePageAsMHTMLFunction::TestDelegate {
   FilePath temp_file_;
 };
 
-IN_PROC_BROWSER_TEST_F(ExtensionSavePageApiTest, MAYBE_SavePageAsMHTML) {
-  SavePageAsMHTMLDelegate delegate;
-  ASSERT_TRUE(RunExtensionTest("save_page")) << message_;
+IN_PROC_BROWSER_TEST_F(ExtensionPageCaptureApiTest, SaveAsMHTML) {
+  PageCaptureSaveAsMHTMLDelegate delegate;
+  ASSERT_TRUE(RunExtensionTest("page_capture")) << message_;
   ASSERT_FALSE(delegate.temp_file_.empty());
   // Flush the file message loop to make sure the delete happens.
   ui_test_utils::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
   ASSERT_FALSE(file_util::PathExists(delegate.temp_file_));
-
 }