Moves bookmark related classes into bookmarks directory. There are no...

chrome/browser/bookmarks/bookmark_storage.h

 // Copyright (c) 2006-2008 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.
 
-#ifndef CHROME_BROWSER_BOOKMARK_STORAGE_H_
-#define CHROME_BROWSER_BOOKMARK_STORAGE_H_
+#ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_STORAGE_H_
+#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_STORAGE_H_
 
 #include "base/ref_counted.h"
 #include "base/task.h"
 #include "chrome/browser/browser_process.h"
 
 class BookmarkBarModel;
 class Profile;
 class Value;
 
 // BookmarkStorage handles reading/write the bookmark bar model. The
@@ skipping 67 matching lines @@
             MessageLoop* message_loop,
             bool load_from_history);
 
  private:
   // Path we read/write to.
   const std::wstring path_;
 
   // Path bookmarks are read from if asked to load from history file.
   const std::wstring tmp_history_path_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(BookmarkStorageBackend);
+  DISALLOW_COPY_AND_ASSIGN(BookmarkStorageBackend);
 };
 
-#endif  // CHROME_BROWSER_BOOKMARK_STORAGE_H_
-
+#endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_STORAGE_H_