CL for Objective-C readability

ios/web/crw_browsing_data_store_unittest.mm

 // Copyright 2015 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.
 
 #import "ios/web/public/crw_browsing_data_store.h"
 
 #include "base/ios/ios_util.h"
 #include "base/logging.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #import "base/test/ios/wait_util.h"
 #include "ios/web/public/active_state_manager.h"
 #include "ios/web/public/browser_state.h"
 #include "ios/web/public/test/test_browser_state.h"
 #include "ios/web/public/test/test_web_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 // An observer to observe the |mode| key changes to a CRWBrowsingDataStore.
 // Used for testing purposes.
 @interface CRWTestBrowsingDataStoreObserver : NSObject
-// Designated init. |browsingDataStore| cannot be null.
-- (instancetype)initWithBrowsingDataStore:
-        (CRWBrowsingDataStore*)browsingDataStore NS_DESIGNATED_INITIALIZER;
-- (instancetype)init NS_UNAVAILABLE;
 // The number of times that the mode of the underlying CRWBrowsingDataStore
 // changed.
 @property(nonatomic, assign) NSUInteger modeChangeCount;
+
+// Designated init. |browsingDataStore| cannot be null.

[stuartmorgan, 2015/07/09 16:33:50]

No need to comment that it's the designated initializer now that we are using
the annotation.

[shreyasv1, 2015/07/09 17:18:01]

Done.

+- (instancetype)initWithBrowsingDataStore:
+    (CRWBrowsingDataStore*)browsingDataStore NS_DESIGNATED_INITIALIZER;
+- (instancetype)init NS_UNAVAILABLE;
 @end
 
 @implementation CRWTestBrowsingDataStoreObserver {
   // The underlying CRWBrowsingDataStore.
   __weak CRWBrowsingDataStore* _browsingDataStore;
 }
 
 @synthesize modeChangeCount = _modeChangeCount;
 
 - (instancetype)initWithBrowsingDataStore:
-        (CRWBrowsingDataStore*)browsingDataStore {
+    (CRWBrowsingDataStore*)browsingDataStore {
   self = [super init];
   if (self) {
     DCHECK(browsingDataStore);
     [browsingDataStore addObserver:self
                         forKeyPath:@"mode"
                            options:0
                            context:nil];
     _browsingDataStore = browsingDataStore;
   }
   return self;
 }
 
 - (instancetype)init {
   NOTREACHED();
   return nil;
 }
 
+- (void)dealloc {
+  [_browsingDataStore removeObserver:self forKeyPath:@"mode"];
+  [super dealloc];
+}
+
 - (void)observeValueForKeyPath:(NSString*)keyPath
                       ofObject:(id)object
                         change:(NSDictionary*)change
                        context:(void*)context {
   DCHECK([keyPath isEqual:@"mode"]);
   DCHECK_EQ(_browsingDataStore, object);
 
   ++self.modeChangeCount;
 }
 
-- (void)dealloc {
-  [_browsingDataStore removeObserver:self forKeyPath:@"mode"];
-  [super dealloc];
-}
-
 @end
 
 namespace web {
 namespace {
 
 class BrowsingDataStoreTest : public PlatformTest {
  protected:
   void SetUp() override {
     PlatformTest::SetUp();
     browser_state_.reset(new TestBrowserState());
@@ skipping 168 matching lines @@
 
   ASSERT_EQ(ACTIVE, [browsing_data_store_ mode]);
 
   [browsing_data_store_ makeInactiveWithCompletionHandler:nil];
   // |removeDataOfTypes| is called immediately after a |makeInactive| call.
   RemoveDataOfTypes(BROWSING_DATA_TYPE_COOKIES);
   EXPECT_EQ(INACTIVE, [browsing_data_store_ mode]);
 }
 
 }  // namespace web