Revert 201968 "Revert 201837 "OOP import on Windows.""

trunk/src/chrome/common/switch_utils_unittest.cc

Index: trunk/src/chrome/common/switch_utils_unittest.cc
===================================================================
--- trunk/src/chrome/common/switch_utils_unittest.cc	(revision 201976)
+++ trunk/src/chrome/common/switch_utils_unittest.cc	(working copy)
@@ -14,8 +14,6 @@
     FILE_PATH_LITERAL("program"),
     FILE_PATH_LITERAL("--app=http://www.google.com/"),
     FILE_PATH_LITERAL("--force-first-run"),
-    FILE_PATH_LITERAL("--import"),
-    FILE_PATH_LITERAL("--import-from-file=c:\\test.html"),
     FILE_PATH_LITERAL("--make-default-browser"),
     FILE_PATH_LITERAL("--foo"),
     FILE_PATH_LITERAL("--bar")};
@@ -24,7 +22,7 @@
 
   std::map<std::string, CommandLine::StringType> switches =
       cmd_line.GetSwitches();
-  EXPECT_EQ(7U, switches.size());
+  EXPECT_EQ(5U, switches.size());
 
   switches::RemoveSwitchesForAutostart(&switches);
   EXPECT_EQ(2U, switches.size());
@@ -40,8 +38,6 @@
       L"program"
       L" --app=http://www.google.com/"
       L" --force-first-run"
-      L" --import"
-      L" --import-from-file=c:\\test.html"
       L" --make-default-browser"
       L" --foo"
       L" --bar");
@@ -49,7 +45,7 @@
 
   std::map<std::string, CommandLine::StringType> switches =
       cmd_line.GetSwitches();
-  EXPECT_EQ(7U, switches.size());
+  EXPECT_EQ(5U, switches.size());
 
   switches::RemoveSwitchesForAutostart(&switches);
   EXPECT_EQ(2U, switches.size());