Move bookmarks/core/... to bookmarks/...

components/bookmarks/browser/bookmark_expanded_state_tracker_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 "components/bookmarks/core/browser/bookmark_expanded_state_tracker.h"
+#include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
 
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_service_factory.h"
 #include "base/prefs/testing_pref_store.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/bookmarks/core/browser/bookmark_model.h"
-#include "components/bookmarks/core/common/bookmark_pref_names.h"
-#include "components/bookmarks/core/test/bookmark_test_helpers.h"
-#include "components/bookmarks/core/test/test_bookmark_client.h"
+#include "components/bookmarks/browser/bookmark_model.h"
+#include "components/bookmarks/common/bookmark_pref_names.h"
+#include "components/bookmarks/test/bookmark_test_helpers.h"
+#include "components/bookmarks/test/test_bookmark_client.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 scoped_ptr<PrefService> PrefServiceForTesting() {
   scoped_refptr<user_prefs::PrefRegistrySyncable> registry(
       new user_prefs::PrefRegistrySyncable());
   registry->RegisterListPref(prefs::kBookmarkEditorExpandedNodes,
                              new base::ListValue,
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   base::PrefServiceFactory factory;
@@ skipping 73 matching lines @@
   BookmarkExpandedStateTracker::Nodes nodes;
   nodes.insert(n1);
   tracker->SetExpandedNodes(nodes);
   // Verify that the node is present.
   EXPECT_EQ(nodes, tracker->GetExpandedNodes());
   // Call remove all.
   model_->RemoveAll();
   // Verify node is not present.
   EXPECT_TRUE(tracker->GetExpandedNodes().empty());
 }