Reinitialize LocalState's CommandLinePrefStore after about_flags updates the command line.

chrome/browser/prefs/pref_service_unittest.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/about_flags.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/prefs/pref_observer_mock.h"
 #include "chrome/browser/prefs/pref_service_mock_builder.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/browser/prefs/testing_pref_store.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_pref_service.h"
-#include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/test/data/resource.h"
 
 using content::BrowserThread;
 using testing::_;
 using testing::Mock;
@@ skipping 107 matching lines @@
       prefs.FindPreference(prefs::kStabilityLaunchCount);
   ASSERT_TRUE(pref);
   const Value* value = pref->GetValue();
   ASSERT_TRUE(value);
   EXPECT_EQ(Value::TYPE_INTEGER, value->GetType());
   int actual_int_value = -1;
   EXPECT_TRUE(value->GetAsInteger(&actual_int_value));
   EXPECT_EQ(kTestValue, actual_int_value);
 }
 
+TEST(PrefServiceTest, UpdateCommandLinePrefStore) {
+  TestingPrefService prefs;
+  prefs.RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, false);
+  const CommandLine::CharType* argv[] = { FILE_PATH_LITERAL("program") };

[Nico, 2012/01/19 00:39:18]

I think the usual pattern is

CommandLine command_line(CommandLine::NO_PROGRAM);
command_line.Append...

[Lei Zhang, 2012/01/19 01:10:29]

Done.

+
+  // Check to make sure the value is as expected.
+  const PrefService::Preference* pref =
+      prefs.FindPreference(prefs::kCloudPrintProxyEnabled);
+  ASSERT_TRUE(pref);
+  const Value* value = pref->GetValue();
+  ASSERT_TRUE(value);
+  EXPECT_EQ(Value::TYPE_BOOLEAN, value->GetType());
+  bool actual_bool_value = true;
+  EXPECT_TRUE(value->GetAsBoolean(&actual_bool_value));
+  EXPECT_EQ(false, actual_bool_value);
+
+  // Change the command line.
+  CommandLine cmd_line(arraysize(argv), argv);
+  cmd_line.AppendSwitch(switches::kEnableCloudPrintProxy);
+  prefs.RegisterListPref(prefs::kEnabledLabsExperiments);
+  about_flags::ConvertFlagsToSwitches(&prefs, &cmd_line);
+

[Nico, 2012/01/19 00:39:18]

Do you want to check if ConvertFlagsToSwiches() added something to cmd_line
here? (I think it would make the test a bit more readable)

[Lei Zhang, 2012/01/19 01:10:29]

Actually, i don't need about_flags in this test, since I already manually
appended the switch.

+  // Call UpdateCommandLinePrefStore and check to see if the value has changed.
+  prefs.UpdateCommandLinePrefStore(&cmd_line);
+  pref = prefs.FindPreference(prefs::kCloudPrintProxyEnabled);
+  ASSERT_TRUE(pref);
+  value = pref->GetValue();
+  ASSERT_TRUE(value);
+  EXPECT_EQ(Value::TYPE_BOOLEAN, value->GetType());
+  actual_bool_value = false;
+  EXPECT_TRUE(value->GetAsBoolean(&actual_bool_value));
+  EXPECT_EQ(true, actual_bool_value);
+}
+
 class PrefServiceSetValueTest : public testing::Test {
  protected:
   static const char kName[];
   static const char kValue[];
 
   TestingPrefService prefs_;
   PrefObserverMock observer_;
 };
 
 const char PrefServiceSetValueTest::kName[] = "name";
@@ skipping 123 matching lines @@
 #if defined(OS_MACOSX)
   const char kDefaultFont[] = "Times";
 #elif defined(OS_CHROMEOS)
   const char kDefaultFont[] = "Tinos";
 #else
   const char kDefaultFont[] = "Times New Roman";
 #endif
   EXPECT_EQ(ASCIIToUTF16(kDefaultFont), webkit_prefs.standard_font_family);
   EXPECT_TRUE(webkit_prefs.javascript_enabled);
 }