Changes the bookmark model to allow more than one bookmark to

reference the same url. Clicking the star button edits the most
recently added bookmark for the URL. Dragging a button/star always
does a move, otherwise drops on the bookmark bar create a new
bookmark.

Also changed the add page context menu for the bookmark bar to
remember where you invoked it from.

BUG=1173228 1678

Review URL: http://codereview.chromium.org/3203

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2413 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 1 deletions

diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index 568369f..c68e9fcb 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -18,6 +18,10 @@
 class TestingProfile : public Profile {
  public:
   TestingProfile();
+  // Creates a new profile by adding |count| to the end of the path. Use this
+  // when you need to have more than one TestingProfile running at the same
+  // time.
+  explicit TestingProfile(int count);
   virtual ~TestingProfile();
 
   // Creates the history service. If |delete_file| is true, the history file is
@@ -107,9 +111,10 @@ class TestingProfile : public Profile {
   virtual void SetName(const std::wstring& name) {
   }
   virtual std::wstring GetID() {
-    return std::wstring();
+    return id_;
   }
   virtual void SetID(const std::wstring& id) {
+    id_ = id;
   }
   virtual bool DidLastSessionExitCleanly() {
     return true;
@@ -170,6 +175,8 @@ class TestingProfile : public Profile {
   // Do we have a history service? This defaults to the value of
   // history_service, but can be explicitly set.
   bool has_history_service_;
+
+  std::wstring id_;
 };
 
 #endif  // CHROME_TEST_TESTING_PROFILE_H__