ash: Minor cleanup, move more files from launcher to shelf.

ash/shelf/scoped_observer_with_duplicated_sources.h

 // Copyright 2013 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 ASH_LAUNCHER_SCOPED_OBSERVER_WITH_DUPLICATED_SOURCES_H_
-#define ASH_LAUNCHER_SCOPED_OBSERVER_WITH_DUPLICATED_SOURCES_H_
+#ifndef ASH_SHELF_SCOPED_OBSERVER_WITH_DUPLICATED_SOURCES_H_
+#define ASH_SHELF_SCOPED_OBSERVER_WITH_DUPLICATED_SOURCES_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 
 // ScopedObserverWithDuplicatedSources is used to keep track of the set of
 // sources an object has attached itself to as an observer. When
 // ScopedObserverWithDuplicatedSources is destroyed it removes the object as an
 // observer from all sources it has been added to.
@@ skipping 43 matching lines @@
   typedef std::map<Source*, int> SourceToAddCountMap;
 
   Observer* observer_;
 
   // Map Source and its adding count.
   std::map<Source*, int> counted_sources_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedObserverWithDuplicatedSources);
 };
 
-#endif  // ASH_LAUNCHER_SCOPED_OBSERVER_WITH_DUPLICATED_SOURCES_H_
+#endif  // ASH_SHELF_SCOPED_OBSERVER_WITH_DUPLICATED_SOURCES_H_