[Extensions Toolbar] Make pref update non-destructive

chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc

 // Copyright 2014 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 "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_action_test_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/test_toolbar_actions_bar_helper.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
+#include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/feature_switch.h"
 
 namespace {
 
 // Verifies that the toolbar order matches for the given |actions_bar|. If the
 // order matches, the return value is empty; otherwise, it contains the error.
 std::string VerifyToolbarOrderForBar(
     const ToolbarActionsBar* actions_bar,
@@ skipping 347 matching lines @@
   EXPECT_EQ(2u, toolbar_actions_bar()->GetIconCount());
 
   // If we shrink the bar so that a full icon can't fit, it should resize to
   // hide that icon.
   toolbar_actions_bar()->OnResizeComplete(width - 1);
   width -= ToolbarActionsBar::IconWidth(true);
   EXPECT_EQ(width, toolbar_actions_bar()->GetPreferredSize().width());
   EXPECT_EQ(1u, toolbar_actions_bar()->GetIconCount());
 }
 
+TEST_F(ToolbarActionsBarUnitTest, ToolbarActionsReorderOnPrefChange) {
+  for (int i = 0; i < 3; ++i) {
+    CreateAndAddExtension(
+        base::StringPrintf("extension %d", i),
+        extensions::extension_action_test_util::BROWSER_ACTION);
+  }
+  EXPECT_EQ(3u, toolbar_actions_bar()->GetIconCount());
+  // Change the value of the toolbar preference.
+  // Test drag-and-drop logic.
+  const char kExtension0[] = "extension 0";
+  const char kExtension1[] = "extension 1";
+  const char kExtension2[] = "extension 2";
+  {
+    // The order should start as 0, 1, 2.
+    const char* expected_names[] = { kExtension0, kExtension1, kExtension2 };
+    EXPECT_TRUE(VerifyToolbarOrder(expected_names, 3u, 3u));
+  }
+
+  extensions::ExtensionIdList new_order;
+  new_order.push_back(toolbar_actions_bar()->toolbar_actions()[1]->GetId());
+  new_order.push_back(toolbar_actions_bar()->toolbar_actions()[2]->GetId());
+  extensions::ExtensionPrefs::Get(profile())->SetToolbarOrder(new_order);
+
+  {
+    // The order should start as 0, 1, 2.

[Finnur, 2015/03/27 09:05:48]

nit: Copy-paste error?

[Devlin, 2015/03/27 18:54:15]

Yep, thanks. :)

+    const char* expected_names[] = { kExtension1, kExtension2, kExtension0 };
+    EXPECT_TRUE(VerifyToolbarOrder(expected_names, 3u, 3u));
+  }
+}
+
 class ToolbarActionsBarRedesignUnitTest : public ToolbarActionsBarUnitTest {
  public:
   ToolbarActionsBarRedesignUnitTest() : ToolbarActionsBarUnitTest(true) {}
   ~ToolbarActionsBarRedesignUnitTest() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarRedesignUnitTest);
 };
 
 TEST_F(ToolbarActionsBarRedesignUnitTest, IconSurfacingBubbleAppearance) {
@@ skipping 330 matching lines @@
     EXPECT_TRUE(VerifyToolbarOrder(expected_names, 3u, 3u));
     // Move "page action" to the overflow menu.
     toolbar_actions_bar()->OnDragDrop(
         0, 2, ToolbarActionsBar::DRAG_TO_OVERFLOW);
     const char* expected_names2[] = { kBrowserAction, kSynthetic, kPageAction };
     EXPECT_TRUE(VerifyToolbarOrder(expected_names2, 3u, 2u));
     SetActionWantsToRunOnTab(action, web_contents, false);
     EXPECT_TRUE(VerifyToolbarOrder(expected_names2, 3u, 2u));
   }
 }