Restart Chrome if per session flags have been specified on ChromeOS.

chrome/browser/about_flags_unittest.cc

 // Copyright (c) 2011 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 "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/about_flags.h"
@@ skipping 203 matching lines @@
 
   EXPECT_TRUE(command_line.HasSwitch("foo"));
   EXPECT_FALSE(command_line.HasSwitch(kSwitch1));
 
   ConvertFlagsToSwitches(&prefs_, &command_line);
 
   EXPECT_TRUE(command_line.HasSwitch("foo"));
   EXPECT_TRUE(command_line.HasSwitch(kSwitch1));
 }
 
+TEST_F(AboutFlagsTest, CompareSwitchesToCurrentCommandLine) {
+  SetExperimentEnabled(&prefs_, kFlags1, true);
+
+  CommandLine command_line(CommandLine::NO_PROGRAM);
+  command_line.AppendSwitch("foo");
+
+  CommandLine new_command_line(CommandLine::NO_PROGRAM);
+  ConvertFlagsToSwitches(&prefs_, &new_command_line);
+
+  EXPECT_FALSE(CompareSwitchesToCurrentCommandLine(new_command_line,
+                                                   command_line));
+
+  ConvertFlagsToSwitches(&prefs_, &command_line);
+
+  EXPECT_TRUE(CompareSwitchesToCurrentCommandLine(new_command_line,
+                                                   command_line));

[Mattias Nissler (ping if slow), 2013/06/13 16:55:57]

nit: indentation.

[pastarmovj, 2013/06/13 17:29:36]

Done.

+
+  // Now both have flags but different.
+  SetExperimentEnabled(&prefs_, kFlags1, false);
+  SetExperimentEnabled(&prefs_, kFlags2, true);
+
+  CommandLine another_command_line(CommandLine::NO_PROGRAM);
+  ConvertFlagsToSwitches(&prefs_, &another_command_line);
+
+  EXPECT_FALSE(CompareSwitchesToCurrentCommandLine(new_command_line,
+                                                   another_command_line));
+}
+
 TEST_F(AboutFlagsTest, RemoveFlagSwitches) {
   std::map<std::string, CommandLine::StringType> switch_list;
   switch_list[kSwitch1] = CommandLine::StringType();
   switch_list[switches::kFlagSwitchesBegin] = CommandLine::StringType();
   switch_list[switches::kFlagSwitchesEnd] = CommandLine::StringType();
   switch_list["foo"] = CommandLine::StringType();
 
   SetExperimentEnabled(&prefs_, kFlags1, true);
 
   // This shouldn't do anything before ConvertFlagsToSwitches() wasn't called.
@@ skipping 184 matching lines @@
   testing::SetExperiments(NULL, 0);
   size_t count;
   const Experiment* experiments = testing::GetExperiments(&count);
     for (size_t i = 0; i < count; ++i) {
     std::string name = experiments->internal_name;
     EXPECT_EQ(std::string::npos, name.find(testing::kMultiSeparator)) << i;
   }
 }
 
 }  // namespace about_flags